Merge remote branch 'markus/qerror' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 17 Mar 2010 14:44:37 +0000 (09:44 -0500)
1  2 
Makefile.target
savevm.c
vl.c

diff --cc Makefile.target
Simple merge
diff --cc savevm.c
Simple merge
diff --cc vl.c
Simple merge