Merge branches 'next-queue' and 'next' into next
authorJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:48:36 +0000 (22:48 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sun, 10 Jun 2012 12:48:36 +0000 (22:48 +1000)
commitf52c44cd27b4a0be37ef97f0466e4095ebebef3f
treea77ad8cffa35427352cd18f94ed9339640e4d473
parent7cf4206a99d1b3e61bdbc7cbbf4a7bf6a9dfcc68
Merge branches 'next-queue' and 'next' into next

Pull in changes submitted during upstream merge window.