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

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

Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)

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

Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
diff --cc Makefile.target
Simple merge
diff --cc configure
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 22 Jun 2011 12:13:10 +0000 (07:13 -0500)
		1	2
Makefile.target	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history