Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 9 Dec 2009 08:01:03 +0000 (19:01 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 9 Dec 2009 08:01:03 +0000 (19:01 +1100)

Trivial merge