Bug 929048 - Back out temp change. r=reverse
Merge branch 'master' of git://github.com/mozilla/build-puppet into db_maint