Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Sun, 17 Jan 2010 22:56:22 +0000 (09:56 +1100)
committerJames Morris <jmorris@namei.org>
Sun, 17 Jan 2010 22:56:22 +0000 (09:56 +1100)

Trivial merge