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

Trivial merge