Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'aneesh/1.0-fixes' into staging