]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qmp/queue/monitor' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 13:48:07 +0000 (08:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 13:48:07 +0000 (08:48 -0500)

Trivial merge