Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 5 Aug 2009 22:55:03 +0000 (08:55 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 5 Aug 2009 22:55:03 +0000 (08:55 +1000)

Trivial merge