Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:07:13 +0000 (09:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:07:13 +0000 (09:07 -0500)

Trivial merge