Merge branch 'upstream-fixes'
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:13:10 +0000 (20:13 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:13:10 +0000 (20:13 -0500)

Trivial merge