Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'amit/for-anthony' into staging