Merge remote-tracking branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:16:24 +0000 (12:16 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:16:24 +0000 (12:16 -0500)
1  2 
qerror.c
qerror.h

diff --cc qerror.c
Simple merge
diff --cc qerror.h
Simple merge