From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 12 Dec 2011 16:08:08 +0000 (-0600)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9bf4896e5d565785316d2c179be91fba11fbf3fb;p=qemu.git

Merge remote-tracking branch 'qmp/queue/qmp' into staging
---

9bf4896e5d565785316d2c179be91fba11fbf3fb