Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'spice/spice.v39' into staging