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