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