Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:51:24 +0000 (14:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 17 May 2006 18:51:24 +0000 (14:51 -0400)

Trivial merge