Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'kwolf/for-anthony' into staging