Merge branch 'next-queue' into next
James Morris [Tue, 29 Mar 2011 21:51:46 +0000 (08:51 +1100)]

Trivial merge