Merge remote-tracking branch 'qmp/queue/qmp' into staging
commit1d2cb1a2d81af4a760aac18521e11e268ad3711b
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:48:00 +0000 (12 20:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:48:00 +0000 (12 20:48 -0500)
tree09d625e22cc1daa5aa4d53fc1553627aa61eb72e
parent8d9dde9429d2b5b513bf92d94a257a00ea2da1bf
parentd03ee40185ae8f6d6993ef58f96e0eb956f3cc33
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi-schema.json: fix comment for type ObjectPropretyInfo
  qapi-schema: fix typos and explain 'spice' auth
  qjson.h: include compiler.h for GCC_FMT_ATTR