Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Aug 2006 18:42:36 +0000 (14:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Aug 2006 18:42:36 +0000 (14:42 -0400)

Trivial merge