Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:17 +0000 (08:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:17 +0000 (08:31 -0500)
1  2 
monitor.c

diff --cc monitor.c
Simple merge