Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Sep 2006 20:40:03 +0000 (16:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Sep 2006 20:40:03 +0000 (16:40 -0400)

Trivial merge