Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jun 2006 19:38:11 +0000 (15:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jun 2006 19:38:11 +0000 (15:38 -0400)

Trivial merge