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

diff --cc monitor.c
Simple merge