Merge branch 'next-queue' into next
authorJames Morris <jmorris@namei.org>
Thu, 9 Feb 2012 06:02:34 +0000 (17:02 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 9 Feb 2012 06:02:34 +0000 (17:02 +1100)

Trivial merge