Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Aug 2006 18:22:14 +0000 (14:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 23 Aug 2006 18:22:14 +0000 (14:22 -0400)

Trivial merge