Merge remote branch 'qemu-kvm/uq/master' into staging-tmp

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

Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)

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

Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
diff --cc exec.c
Simple merge
diff --cc vl.c
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 8 Feb 2010 16:06:54 +0000 (10:06 -0600)
		1	2
exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history