Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000 (10:56 +1000)

Trivial merge