Merge remote-tracking branch 'qmp/queue/qmp-1.0' into staging
commit7197390a0b6e38017af94135b6055d8b7c6c2370
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:23:38 +0000 (18 13:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:23:38 +0000 (18 13:23 -0600)
tree955abecce37b1f37d863d8080b30de66935b8d5d
parentc951d9a6751576a076ac80a5e5145ceb8d794d38
parent1b14254b4815a0ddf9c5b6094b6f6fccd7203fca
Merge remote-tracking branch 'qmp/queue/qmp-1.0' into staging