From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 23 Apr 2012 19:29:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Tag: v1.1-rc0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=645467842339207d895c41f4e4526507b95a636a;p=thirdparty%2Fqemu.git

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

* qmp/queue/qmp:
  qapi: g_hash_table_find() instead of GHashTableIter.
  qmp: make block job command naming consistent
---

645467842339207d895c41f4e4526507b95a636a