Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'spice/spice.v37' into staging
Conflicts: vl.c