Merge remote-tracking branch 'stefanha/trivial-patches' into staging

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

Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)

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

Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)
diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Thu, 4 Aug 2011 22:14:01 +0000 (17:14 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history