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

Trivial merge