From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 8 Jun 2011 17:16:24 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=924f766af9be3ff036a419fc85ed740aa01f8eac;p=qemu.git

Merge remote-tracking branch 'qmp/for-anthony' into staging
---

924f766af9be3ff036a419fc85ed740aa01f8eac