Added by Anthony Liguori over 10 years ago
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts: hw/pc.c