Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:26:25 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:26:25 +0000 (14:26 -0400)

Trivial merge