Merge branch 'linus'
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 31 Jan 2007 17:24:00 +0000 (11:24 -0600)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 31 Jan 2007 17:24:00 +0000 (11:24 -0600)

Trivial merge