Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Mon, 8 Jun 2009 23:27:53 +0000 (09:27 +1000)
committerJames Morris <jmorris@namei.org>
Mon, 8 Jun 2009 23:27:53 +0000 (09:27 +1000)

Trivial merge