Merge remote branch 'markus/qerror' into staging

author Anthony Liguori <[email protected]>

Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)

committer Anthony Liguori <[email protected]>

Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
author Anthony Liguori <[email protected]>
Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
committer Anthony Liguori <[email protected]>
Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
diff --cc Makefile.target
Simple merge
diff --cc savevm.c
Simple merge
diff --cc vl.c
Simple merge
author	Anthony Liguori <[email protected]>
	Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
committer	Anthony Liguori <[email protected]>
	Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
		1	2
Makefile.target	patch \|	diff1 \|	diff2 \|	blob \| history
savevm.c	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history