Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 19:31:57 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 19:31:57 +0000 (15:31 -0400)

Trivial merge