Added by Anthony Liguori about 13 years ago
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts: trace-events