Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 26 Mar 2009 21:28:11 +0000 (08:28 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 26 Mar 2009 21:28:11 +0000 (08:28 +1100)

Trivial merge