Merge remote branch 'qmp/for-anthony' into staging
commit48f57044e6a826329ebcac5d5a76d776a14e5d43
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 18:54:49 +0000 (5 13:54 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 18:54:49 +0000 (5 13:54 -0500)
treecc99327c9a0d496ed0c400a31c919b517f9d09f4
parente0c8a796d522b80c21b005a19610829c4be2154f
parenta18b2ce2ed9dc747c2ebab5a220517624e4ff3df
Merge remote branch 'qmp/for-anthony' into staging
Makefile
Makefile.target
monitor.c
monitor.h
qjson.h