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