Merge remote branch 'qmp/for-anthony' into staging
commitfef395782d76fa497bfc89cea741173706669b2e
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:05 +0000 (17 08:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:05 +0000 (17 08:23 -0600)
treec4ea4e9ec889c9261761752d3e8c99145d90346e
parent2e44928e3c1b9425c17d0786f7d9139871bba43f
parent3a019b6e6ad64e4df452a15dced6c954e45246c4
Merge remote branch 'qmp/for-anthony' into staging
monitor.c