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)
commit1a14224fd5de702fdb555dd87f9fb51ab83947db
tree8e645fa4dc1be00eb06df8cab7a0501a64cffe55
parentaa8ab3fff180bae34e10ceadf569b601400c813a
parent8c9276792b7b5c85df39f1352a28e02e90ea041f
Merge remote-tracking branch 'qmp/for-anthony' into staging
qerror.c
qerror.h