Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 18:42:27 +0000 (14:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 5 Jun 2006 18:42:27 +0000 (14:42 -0400)

Trivial merge