Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:06:58 +0000 (16:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:06:58 +0000 (16:06 -0400)

Trivial merge