Merge branch 'upstream-fixes'
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Mar 2006 22:02:08 +0000 (17:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Mar 2006 22:02:08 +0000 (17:02 -0500)

Trivial merge