Merge remote-tracking branch 'awilliam/ipxe' into staging

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

Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)

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

Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)
diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 25 Apr 2011 15:26:10 +0000 (10:26 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history