Merge branch 'upstream-fixes'
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:58 +0000 (08:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Feb 2006 13:15:58 +0000 (08:15 -0500)

Trivial merge