Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'aneesh/for-upstream-1' into staging