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