Automated conversion from mozilla-aurora
Automated conversion from mozilla-central