Merge branch 'next-queue' into next
authorJames Morris <jmorris@namei.org>
Tue, 9 Mar 2010 01:46:47 +0000 (12:46 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 9 Mar 2010 01:46:47 +0000 (12:46 +1100)

Trivial merge