Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Mon, 23 Mar 2009 23:52:46 +0000 (10:52 +1100)
committerJames Morris <jmorris@namei.org>
Mon, 23 Mar 2009 23:52:46 +0000 (10:52 +1100)

Trivial merge