Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'mst/for_anthony' into staging