Merge branch 'block'
authorJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 05:29:40 +0000 (23:29 -0600)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 05:29:40 +0000 (23:29 -0600)

Trivial merge