Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'qmp/queue/qmp' into staging