Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Aug 2006 18:24:15 +0000 (14:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Aug 2006 18:24:15 +0000 (14:24 -0400)

Trivial merge