Added by Anthony Liguori over 12 years ago
Merge remote-tracking branch 'kraxel/migration.2' into staging