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