Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'spice/spice.v41' into staging