tree 09d625e22cc1daa5aa4d53fc1553627aa61eb72e
parent 8d9dde9429d2b5b513bf92d94a257a00ea2da1bf
parent d03ee40185ae8f6d6993ef58f96e0eb956f3cc33
author Anthony Liguori <aliguori@us.ibm.com> 1331603280 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1331603280 -0500

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