Merge remote branch 'mst/for_anthony' into staging

author Anthony Liguori <aliguori@us.ibm.com>

Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)

committer Anthony Liguori <aliguori@us.ibm.com>

Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)
diff --cc Makefile.target
Simple merge
diff --cc hmp-commands.hx
Simple merge
diff --cc sysemu.h
Simple merge
diff --cc vl.c
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 10 Jan 2011 16:32:01 +0000 (10:32 -0600)
		1	2
Makefile.target	patch \|	diff1 \|	diff2 \|	blob \| history
hmp-commands.hx	patch \|	diff1 \|	diff2 \|	blob \| history
sysemu.h	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history