Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:56:24 +0000 (16:56 -0400)

Trivial merge