Added by Anthony Liguori about 13 years ago
Merge remote-tracking branch 'mst/for_anthony' into staging
Conflicts: hw/usb-uhci.c