Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 18 Jun 2009 22:20:55 +0000 (08:20 +1000)

Trivial merge