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