Merge remote-tracking branch 'qmp/for-anthony' into staging

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

Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)

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

Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)
diff --cc Makefile.objs
Simple merge
diff --cc configure
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Fri, 22 Jul 2011 14:23:53 +0000 (09:23 -0500)
		1	2
Makefile.objs	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history