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