Merge remote-tracking branch 'qmp/queue/qmp-1.0' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:23:38 +0000 (13:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:23:38 +0000 (13:23 -0600)

Trivial merge