Merge remote-tracking branch 'luiz/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Apr 2013 20:57:27 +0000 (15:57 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Apr 2013 20:57:27 +0000 (15:57 -0500)
# By Amos Kong
# Via Luiz Capitulino
* luiz/queue/qmp:
  monitor: introduce query-command-line-options

Message-id: 1366922656-32545-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge