Merge branch 'next-queue' into next
authorJames Morris <jmorris@namei.org>
Tue, 29 Mar 2011 21:51:46 +0000 (08:51 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 29 Mar 2011 21:51:46 +0000 (08:51 +1100)

Trivial merge