From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 22 Jul 2011 14:23:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/for-anthony' into staging
X-Git-Tag: v0.15.0-rc0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44129530ddf9edcc95913a4c05c755fb732c2bfe;p=thirdparty%2Fqemu.git

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

44129530ddf9edcc95913a4c05c755fb732c2bfe