Merge default -> seamonkey-production seamonkey-production
authorJustin Wood <Callek@gmail.com>
Tue, 18 Jun 2013 16:11:55 -0400
branchseamonkey-production
changeset 8590 ce40a5746a8e4811b2212b8eb987e8f4f21a79e1
parent 8364 9bc70f03d38ee3ba367be3474fb188b4d9256411 (current diff)
parent 8589 a486e9b59b094e3415fe2ab0e252db27b4cfbac4 (diff)
child 8591 e82326b1ecad6d6f5493147b241d756509164117
push id6509
push userCallek@gmail.com
push dateTue, 18 Jun 2013 20:12:01 +0000
Merge default -> seamonkey-production
.hgtags
geriatric/config.py
geriatric/master.cfg
mozilla-tests/addonprefs.diff
mozilla-tests/production_addon_config.py
mozilla-tests/production_addon_master_localconfig.py
mozilla-tests/staging_addon_config.py
mozilla-tests/staging_addon_master_localconfig.py
mozilla-tests/staging_ateam_config.py
mozilla-tests/staging_ateam_master01_localconfig.py
mozilla-tests/staging_ateam_master02_localconfig.py
mozilla-tests/staging_tests_master_stm01_localconfig.py
mozilla-tests/staging_tests_master_stm02_localconfig.py
mozilla/l10n-changesets_mobile-esr10.json
mozilla/l10n-changesets_mozilla-1.9.2
mozilla/l10n/all-locales.mozilla-1.9.1
mozilla/l10n/all-locales.mozilla-1.9.2
mozilla/l10n/all-locales.mozilla-2.0
mozilla/preproduction_release_overrides-1.9.2.py
mozilla/release-fennec-mozilla-esr10.py
mozilla/release-firefox-mozilla-1.9.2.py
mozilla/release-firefox-mozilla-esr10.py
mozilla/release_templates/tag_failed
mozilla/release_templates/tag_success
mozilla/staging_builder_master_sm01_localconfig.py
mozilla/staging_builder_master_sm02_localconfig.py
mozilla/staging_builder_master_sm03_localconfig.py
mozilla/staging_release-fennec-mozilla-esr10.py
mozilla/staging_release-firefox-mozilla-1.9.2.py
mozilla/staging_release-firefox-mozilla-esr10.py
mozilla/staging_scheduler_master_sm01_localconfig.py
mozilla2/android-debug/accessibility/nightly/mozconfig
mozilla2/android-debug/electrolysis/nightly/mozconfig
mozilla2/android-debug/jaegermonkey/nightly/mozconfig
mozilla2/android-debug/mozilla-release/nightly/mozconfig
mozilla2/android-debug/shadow-central/nightly/mozconfig
mozilla2/android-xul/accessibility/nightly/mozconfig
mozilla2/android-xul/electrolysis/nightly/mozconfig
mozilla2/android-xul/generic/nightly/mozconfig
mozilla2/android-xul/jaegermonkey/nightly/mozconfig
mozilla2/android-xul/mozilla-aurora/nightly/l10n-mozconfig
mozilla2/android-xul/mozilla-aurora/nightly/mozconfig
mozilla2/android-xul/mozilla-beta/nightly/l10n-mozconfig
mozilla2/android-xul/mozilla-beta/nightly/mozconfig
mozilla2/android-xul/mozilla-beta/release/l10n-mozconfig
mozilla2/android-xul/mozilla-beta/release/mozconfig
mozilla2/android-xul/mozilla-central/nightly/l10n-mozconfig
mozilla2/android-xul/mozilla-central/nightly/mozconfig
mozilla2/android-xul/mozilla-release/nightly/l10n-mozconfig
mozilla2/android-xul/mozilla-release/nightly/mozconfig
mozilla2/android-xul/mozilla-release/release/l10n-mozconfig
mozilla2/android-xul/mozilla-release/release/mozconfig
mozilla2/android-xul/shadow-central/nightly/mozconfig
mozilla2/android-xul/try/nightly/mozconfig
mozilla2/android-xul/ux/nightly/mozconfig
mozilla2/android/accessibility/nightly/mozconfig
mozilla2/android/electrolysis/nightly/mozconfig
mozilla2/android/jaegermonkey/nightly/mozconfig
mozilla2/android/mozilla-release/nightly/l10n-mozconfig
mozilla2/android/mozilla-release/nightly/mozconfig
mozilla2/android/mozilla-release/release/mozconfig
mozilla2/android/shadow-central/nightly/mozconfig
mozilla2/linux-android/accessibility/nightly/mozconfig
mozilla2/linux-android/electrolysis/nightly/mozconfig
mozilla2/linux-android/generic/nightly/mozconfig
mozilla2/linux-android/jaegermonkey/nightly/mozconfig
mozilla2/linux-android/mozilla-aurora/nightly/mozconfig
mozilla2/linux-android/mozilla-beta/nightly/mozconfig
mozilla2/linux-android/mozilla-beta/release/mozconfig
mozilla2/linux-android/mozilla-central/nightly/mozconfig
mozilla2/linux-android/mozilla-esr10/nightly/mozconfig
mozilla2/linux-android/mozilla-esr10/release/mozconfig
mozilla2/linux-android/mozilla-release/nightly/mozconfig
mozilla2/linux-android/mozilla-release/release/mozconfig
mozilla2/linux-android/shadow-central/nightly/mozconfig
mozilla2/linux-android/try/nightly/mozconfig
mozilla2/linux-android/ux/nightly/mozconfig
mozilla2/linux/accessibility/codecoverage/mozconfig
mozilla2/linux/accessibility/debug/mozconfig
mozilla2/linux/accessibility/nightly-rpm/mozconfig
mozilla2/linux/accessibility/nightly/mozconfig
mozilla2/linux/accessibility/qt/mozconfig
mozilla2/linux/accessibility/release/l10n-mozconfig
mozilla2/linux/accessibility/release/mozconfig
mozilla2/linux/accessibility/unittest/mozconfig
mozilla2/linux/accessibility/xulrunner-qt/mozconfig
mozilla2/linux/accessibility/xulrunner/mozconfig
mozilla2/linux/electrolysis/debug/mozconfig
mozilla2/linux/electrolysis/nightly/mozconfig
mozilla2/linux/electrolysis/qt/mozconfig
mozilla2/linux/electrolysis/unittest/mozconfig
mozilla2/linux/electrolysis/xulrunner/mozconfig
mozilla2/linux/jaegermonkey/debug/mozconfig
mozilla2/linux/jaegermonkey/nightly/mozconfig
mozilla2/linux/jaegermonkey/qt/mozconfig
mozilla2/linux/mozilla-1.9.2/codecoverage/mozconfig
mozilla2/linux/mozilla-1.9.2/debug/mozconfig
mozilla2/linux/mozilla-1.9.2/nightly/mozconfig
mozilla2/linux/mozilla-1.9.2/release/l10n-mozconfig
mozilla2/linux/mozilla-1.9.2/release/mozconfig
mozilla2/linux/mozilla-1.9.2/unittest/mozconfig
mozilla2/linux/mozilla-1.9.2/xulrunner/mozconfig
mozilla2/linux/mozilla-2.0/codecoverage/mozconfig
mozilla2/linux/mozilla-2.0/debug/mozconfig
mozilla2/linux/mozilla-2.0/nightly/mozconfig
mozilla2/linux/mozilla-2.0/qt/mozconfig
mozilla2/linux/mozilla-2.0/release/l10n-mozconfig
mozilla2/linux/mozilla-2.0/release/mozconfig
mozilla2/linux/mozilla-2.0/unittest/mozconfig
mozilla2/linux/mozilla-2.0/xulrunner-qt/mozconfig
mozilla2/linux/mozilla-2.0/xulrunner/mozconfig
mozilla2/linux/mozilla-aurora/unittest/mozconfig
mozilla2/linux/mozilla-central/unittest/mozconfig
mozilla2/linux/mozilla-release/nightly/mozconfig
mozilla2/linux/mozilla-release/release/mozconfig
mozilla2/linux/places/codecoverage/mozconfig
mozilla2/linux/places/debug/mozconfig
mozilla2/linux/places/nightly-rpm/mozconfig
mozilla2/linux/places/nightly/mozconfig
mozilla2/linux/places/qt/mozconfig
mozilla2/linux/places/release/l10n-mozconfig
mozilla2/linux/places/release/mozconfig
mozilla2/linux/places/unittest/mozconfig
mozilla2/linux/places/xulrunner-qt/mozconfig
mozilla2/linux/places/xulrunner/mozconfig
mozilla2/linux/shadow-central/codecoverage/mozconfig
mozilla2/linux/shadow-central/debug/mozconfig
mozilla2/linux/shadow-central/nightly-rpm/mozconfig
mozilla2/linux/shadow-central/nightly/mozconfig
mozilla2/linux/shadow-central/qt/mozconfig
mozilla2/linux/shadow-central/release/l10n-mozconfig
mozilla2/linux/shadow-central/release/mozconfig
mozilla2/linux/shadow-central/unittest/mozconfig
mozilla2/linux/shadow-central/xulrunner-qt/mozconfig
mozilla2/linux/shadow-central/xulrunner/mozconfig
mozilla2/linux64/accessibility/codecoverage/mozconfig
mozilla2/linux64/accessibility/debug/mozconfig
mozilla2/linux64/accessibility/nightly-rpm/mozconfig
mozilla2/linux64/accessibility/nightly/mozconfig
mozilla2/linux64/accessibility/release/l10n-mozconfig
mozilla2/linux64/accessibility/release/mozconfig
mozilla2/linux64/accessibility/unittest/mozconfig
mozilla2/linux64/accessibility/xulrunner/mozconfig
mozilla2/linux64/electrolysis/codecoverage/mozconfig
mozilla2/linux64/electrolysis/debug/mozconfig
mozilla2/linux64/electrolysis/nightly/mozconfig
mozilla2/linux64/electrolysis/release/l10n-mozconfig
mozilla2/linux64/electrolysis/release/mozconfig
mozilla2/linux64/electrolysis/unittest/mozconfig
mozilla2/linux64/electrolysis/xulrunner/mozconfig
mozilla2/linux64/jaegermonkey/debug/mozconfig
mozilla2/linux64/jaegermonkey/nightly/mozconfig
mozilla2/linux64/mozilla-1.9.2/codecoverage/mozconfig
mozilla2/linux64/mozilla-1.9.2/debug/mozconfig
mozilla2/linux64/mozilla-1.9.2/nightly/mozconfig
mozilla2/linux64/mozilla-1.9.2/release/l10n-mozconfig
mozilla2/linux64/mozilla-1.9.2/release/mozconfig
mozilla2/linux64/mozilla-1.9.2/unittest/mozconfig
mozilla2/linux64/mozilla-1.9.2/xulrunner/mozconfig
mozilla2/linux64/mozilla-2.0/codecoverage/mozconfig
mozilla2/linux64/mozilla-2.0/debug/mozconfig
mozilla2/linux64/mozilla-2.0/nightly/mozconfig
mozilla2/linux64/mozilla-2.0/release/l10n-mozconfig
mozilla2/linux64/mozilla-2.0/release/mozconfig
mozilla2/linux64/mozilla-2.0/unittest/mozconfig
mozilla2/linux64/mozilla-2.0/xulrunner/mozconfig
mozilla2/linux64/mozilla-aurora/unittest/mozconfig
mozilla2/linux64/mozilla-central/unittest/mozconfig
mozilla2/linux64/mozilla-release/nightly/mozconfig
mozilla2/linux64/mozilla-release/release/mozconfig
mozilla2/linux64/places/codecoverage/mozconfig
mozilla2/linux64/places/debug/mozconfig
mozilla2/linux64/places/nightly-rpm/mozconfig
mozilla2/linux64/places/nightly/mozconfig
mozilla2/linux64/places/release/l10n-mozconfig
mozilla2/linux64/places/release/mozconfig
mozilla2/linux64/places/unittest/mozconfig
mozilla2/linux64/places/xulrunner/mozconfig
mozilla2/linux64/shadow-central/codecoverage/mozconfig
mozilla2/linux64/shadow-central/debug/mozconfig
mozilla2/linux64/shadow-central/nightly-rpm/mozconfig
mozilla2/linux64/shadow-central/nightly/mozconfig
mozilla2/linux64/shadow-central/release/l10n-mozconfig
mozilla2/linux64/shadow-central/release/mozconfig
mozilla2/linux64/shadow-central/unittest/mozconfig
mozilla2/linux64/shadow-central/xulrunner/mozconfig
mozilla2/macosx/accessibility/debug/mozconfig
mozilla2/macosx/accessibility/nightly/mozconfig
mozilla2/macosx/accessibility/release/mozconfig
mozilla2/macosx/accessibility/shark/mozconfig
mozilla2/macosx/accessibility/unittest/mozconfig
mozilla2/macosx/accessibility/xulrunner/mozconfig
mozilla2/macosx/electrolysis/debug/mozconfig
mozilla2/macosx/electrolysis/nightly/mozconfig
mozilla2/macosx/electrolysis/release/mozconfig
mozilla2/macosx/electrolysis/shark/mozconfig
mozilla2/macosx/electrolysis/unittest/mozconfig
mozilla2/macosx/electrolysis/xulrunner/mozconfig
mozilla2/macosx/generic/debug/mozconfig
mozilla2/macosx/generic/nightly/mozconfig
mozilla2/macosx/generic/shark/mozconfig
mozilla2/macosx/jaegermonkey/debug/mozconfig
mozilla2/macosx/jaegermonkey/nightly/mozconfig
mozilla2/macosx/mozilla-1.9.2/debug/mozconfig
mozilla2/macosx/mozilla-1.9.2/nightly/mozconfig
mozilla2/macosx/mozilla-1.9.2/release/l10n-mozconfig
mozilla2/macosx/mozilla-1.9.2/release/mozconfig
mozilla2/macosx/mozilla-1.9.2/shark/mozconfig
mozilla2/macosx/mozilla-1.9.2/unittest/mozconfig
mozilla2/macosx/mozilla-1.9.2/xulrunner/mozconfig
mozilla2/macosx/mozilla-2.0/debug/mozconfig
mozilla2/macosx/mozilla-2.0/nightly/mozconfig
mozilla2/macosx/mozilla-2.0/release/mozconfig
mozilla2/macosx/mozilla-2.0/shark/mozconfig
mozilla2/macosx/mozilla-2.0/unittest/mozconfig
mozilla2/macosx/mozilla-2.0/xulrunner/mozconfig
mozilla2/macosx/mozilla-aurora/debug/mozconfig
mozilla2/macosx/mozilla-aurora/nightly/mozconfig
mozilla2/macosx/mozilla-aurora/release/mozconfig
mozilla2/macosx/mozilla-aurora/shark/mozconfig
mozilla2/macosx/mozilla-aurora/unittest/mozconfig
mozilla2/macosx/mozilla-aurora/xulrunner/mozconfig
mozilla2/macosx/mozilla-beta/debug/mozconfig
mozilla2/macosx/mozilla-beta/nightly/mozconfig
mozilla2/macosx/mozilla-beta/release/mozconfig
mozilla2/macosx/mozilla-beta/shark/mozconfig
mozilla2/macosx/mozilla-beta/xulrunner/mozconfig
mozilla2/macosx/mozilla-central/debug/mozconfig
mozilla2/macosx/mozilla-central/nightly/mozconfig
mozilla2/macosx/mozilla-central/release/mozconfig
mozilla2/macosx/mozilla-central/shark/mozconfig
mozilla2/macosx/mozilla-central/unittest/mozconfig
mozilla2/macosx/mozilla-central/xulrunner/mozconfig
mozilla2/macosx/mozilla-release/debug/mozconfig
mozilla2/macosx/places/debug/mozconfig
mozilla2/macosx/places/nightly/mozconfig
mozilla2/macosx/places/release/mozconfig
mozilla2/macosx/places/shark/mozconfig
mozilla2/macosx/places/unittest/mozconfig
mozilla2/macosx/places/xulrunner/mozconfig
mozilla2/macosx/shadow-central/debug/mozconfig
mozilla2/macosx/shadow-central/nightly/mozconfig
mozilla2/macosx/shadow-central/release/mozconfig
mozilla2/macosx/shadow-central/shark/mozconfig
mozilla2/macosx/shadow-central/unittest/mozconfig
mozilla2/macosx/shadow-central/xulrunner/mozconfig
mozilla2/macosx/try/debug/mozconfig
mozilla2/macosx/try/nightly/mozconfig
mozilla2/macosx/try/shark/mozconfig
mozilla2/macosx/ux/debug/mozconfig
mozilla2/macosx/ux/nightly/mozconfig
mozilla2/macosx64/accessibility/debug/mozconfig
mozilla2/macosx64/accessibility/nightly/mozconfig
mozilla2/macosx64/accessibility/release/l10n-mozconfig
mozilla2/macosx64/accessibility/release/mozconfig
mozilla2/macosx64/accessibility/shark/mozconfig
mozilla2/macosx64/accessibility/xulrunner/mozconfig
mozilla2/macosx64/electrolysis/debug/mozconfig
mozilla2/macosx64/electrolysis/nightly/mozconfig
mozilla2/macosx64/electrolysis/shark/mozconfig
mozilla2/macosx64/generic/shark/mozconfig
mozilla2/macosx64/jaegermonkey/debug/mozconfig
mozilla2/macosx64/jaegermonkey/nightly/mozconfig
mozilla2/macosx64/mozilla-2.0/shark/mozconfig
mozilla2/macosx64/mozilla-aurora/shark/mozconfig
mozilla2/macosx64/mozilla-beta/shark/mozconfig
mozilla2/macosx64/mozilla-central/shark/mozconfig
mozilla2/macosx64/mozilla-release/nightly/mozconfig
mozilla2/macosx64/mozilla-release/release/mozconfig
mozilla2/macosx64/mozilla-release/shark/mozconfig
mozilla2/macosx64/places/debug/mozconfig
mozilla2/macosx64/places/nightly/mozconfig
mozilla2/macosx64/places/release/l10n-mozconfig
mozilla2/macosx64/places/release/mozconfig
mozilla2/macosx64/places/shark/mozconfig
mozilla2/macosx64/places/xulrunner/mozconfig
mozilla2/macosx64/shadow-central/debug/mozconfig
mozilla2/macosx64/shadow-central/nightly/mozconfig
mozilla2/macosx64/shadow-central/release/l10n-mozconfig
mozilla2/macosx64/shadow-central/release/mozconfig
mozilla2/macosx64/shadow-central/shark/mozconfig
mozilla2/macosx64/shadow-central/xulrunner/mozconfig
mozilla2/win32/accessibility/debug/mozconfig
mozilla2/win32/accessibility/nightly/mozconfig
mozilla2/win32/accessibility/release/l10n-mozconfig
mozilla2/win32/accessibility/release/mozconfig
mozilla2/win32/accessibility/unittest/mozconfig
mozilla2/win32/accessibility/xulrunner/mozconfig
mozilla2/win32/electrolysis/debug/mozconfig
mozilla2/win32/electrolysis/nightly/mozconfig
mozilla2/win32/electrolysis/release/mozconfig
mozilla2/win32/electrolysis/unittest/mozconfig
mozilla2/win32/electrolysis/xulrunner/mozconfig
mozilla2/win32/jaegermonkey/debug/mozconfig
mozilla2/win32/jaegermonkey/nightly/mozconfig
mozilla2/win32/mozilla-1.9.2/debug/mozconfig
mozilla2/win32/mozilla-1.9.2/nightly/mozconfig
mozilla2/win32/mozilla-1.9.2/release/l10n-mozconfig
mozilla2/win32/mozilla-1.9.2/release/mozconfig
mozilla2/win32/mozilla-1.9.2/unittest/mozconfig
mozilla2/win32/mozilla-1.9.2/xulrunner/mozconfig
mozilla2/win32/mozilla-2.0/debug/mozconfig
mozilla2/win32/mozilla-2.0/nightly/mozconfig
mozilla2/win32/mozilla-2.0/release/l10n-mozconfig
mozilla2/win32/mozilla-2.0/release/mozconfig
mozilla2/win32/mozilla-2.0/unittest/mozconfig
mozilla2/win32/mozilla-2.0/xulrunner/mozconfig
mozilla2/win32/mozilla-aurora/unittest/mozconfig
mozilla2/win32/mozilla-beta/unittest/mozconfig
mozilla2/win32/mozilla-central/unittest/mozconfig
mozilla2/win32/mozilla-release/nightly/mozconfig
mozilla2/win32/mozilla-release/release/mozconfig
mozilla2/win32/mozilla-release/unittest/mozconfig
mozilla2/win32/places/debug/mozconfig
mozilla2/win32/places/nightly/mozconfig
mozilla2/win32/places/release/mozconfig
mozilla2/win32/places/unittest/mozconfig
mozilla2/win32/places/xulrunner/mozconfig
mozilla2/win32/shadow-central/debug/mozconfig
mozilla2/win32/shadow-central/nightly/mozconfig
mozilla2/win32/shadow-central/xulrunner/mozconfig
mozilla2/win64/accessibility/debug/mozconfig
mozilla2/win64/accessibility/nightly/mozconfig
mozilla2/win64/accessibility/xulrunner/mozconfig
mozilla2/win64/electrolysis/debug/mozconfig
mozilla2/win64/electrolysis/nightly/mozconfig
mozilla2/win64/electrolysis/xulrunner/mozconfig
mozilla2/win64/jaegermonkey/debug/mozconfig
mozilla2/win64/jaegermonkey/nightly/mozconfig
mozilla2/win64/jaegermonkey/xulrunner/mozconfig
mozilla2/win64/places/debug/mozconfig
mozilla2/win64/places/nightly/mozconfig
mozilla2/win64/places/xulrunner/mozconfig
mozilla2/win64/shadow-central/debug/mozconfig
mozilla2/win64/shadow-central/nightly/mozconfig
mozilla2/win64/shadow-central/xulrunner/mozconfig
seamonkey/ccfactory.py
seamonkey/config.py
seamonkey/master-main.cfg
seamonkey/release_master.py
talos-pool/BuildSlaves.py.template
talos-pool/config.py
talos-pool/master.cfg
talos-r3/BuildSlaves.py.template
talos-r3/config.py
talos-r3/master-common.cfg
talos-r3/master1.cfg
talos-r3/master2.cfg
talos-r3/master3.cfg
talos-staging-pool/BuildSlaves.py.template
talos-staging-pool/config.py
talos-staging-pool/ftppoller.py
talos-staging-pool/master-common.cfg
talos-staging-pool/master1.cfg
talos-staging-pool/master2.cfg
thunderbird-try/buildbot.tac
thunderbird-try/config.py
thunderbird-try/master-main.cfg
thunderbird-try/master.cfg
thunderbird-try/public_html/bg_gradient.jpg
thunderbird-try/public_html/default.css
thunderbird-try/public_html/favicon.ico
thunderbird-try/public_html/robots.txt
thunderbird/Makefile
thunderbird/buildbot.tac
thunderbird/config.py
thunderbird/l10n-thunderbird-changesets-3.0
thunderbird/l10n-thunderbird-changesets-3.1
thunderbird/l10n-thunderbird-changesets-5.0
thunderbird/l10n-thunderbird-changesets-beta
thunderbird/l10n-thunderbird-changesets-esr10
thunderbird/l10n-thunderbird-changesets-release
thunderbird/l10n/all-locales.comm-1.9.2
thunderbird/l10n/all-locales.comm-aurora
thunderbird/l10n/all-locales.comm-beta
thunderbird/l10n/all-locales.comm-central
thunderbird/l10nbuilds.ini
thunderbird/linux/comm-1.9.2/debug/mozconfig
thunderbird/linux/comm-1.9.2/l10n/mozconfig
thunderbird/linux/comm-1.9.2/nightly/mozconfig
thunderbird/linux/comm-1.9.2/release/mozconfig
thunderbird/linux/comm-1.9.2/unittest/mozconfig
thunderbird/linux/comm-aurora/debug/mozconfig
thunderbird/linux/comm-aurora/nightly/mozconfig
thunderbird/linux/comm-beta/debug/mozconfig
thunderbird/linux/comm-beta/l10n/mozconfig
thunderbird/linux/comm-beta/nightly/mozconfig
thunderbird/linux/comm-beta/release/mozconfig
thunderbird/linux/comm-central-tested
thunderbird/linux/comm-central/debug/mozconfig
thunderbird/linux/comm-central/nightly/mozconfig
thunderbird/linux/comm-esr10/debug/mozconfig
thunderbird/linux/comm-esr10/l10n/mozconfig
thunderbird/linux/comm-esr10/nightly/mozconfig
thunderbird/linux/comm-esr10/release/mozconfig
thunderbird/linux/comm-release/debug/mozconfig
thunderbird/linux/comm-release/l10n/mozconfig
thunderbird/linux/comm-release/nightly/mozconfig
thunderbird/linux/comm-release/release/mozconfig
thunderbird/linux/try/debug/mozconfig
thunderbird/linux/try/nightly/mozconfig
thunderbird/linux64/comm-1.9.2/unittest/mozconfig
thunderbird/linux64/comm-aurora/debug/mozconfig
thunderbird/linux64/comm-aurora/nightly/mozconfig
thunderbird/linux64/comm-beta/debug/mozconfig
thunderbird/linux64/comm-beta/l10n/mozconfig
thunderbird/linux64/comm-beta/nightly/mozconfig
thunderbird/linux64/comm-beta/release/mozconfig
thunderbird/linux64/comm-central-tested
thunderbird/linux64/comm-central/debug/mozconfig
thunderbird/linux64/comm-central/nightly/mozconfig
thunderbird/linux64/comm-esr10/debug/mozconfig
thunderbird/linux64/comm-esr10/l10n/mozconfig
thunderbird/linux64/comm-esr10/nightly/mozconfig
thunderbird/linux64/comm-esr10/release/mozconfig
thunderbird/linux64/comm-release/debug/mozconfig
thunderbird/linux64/comm-release/l10n/mozconfig
thunderbird/linux64/comm-release/nightly/mozconfig
thunderbird/linux64/comm-release/release/mozconfig
thunderbird/linux64/try/debug/mozconfig
thunderbird/linux64/try/nightly/mozconfig
thunderbird/macosx-shark/mozconfig
thunderbird/macosx/comm-1.9.2/debug/mozconfig
thunderbird/macosx/comm-1.9.2/l10n/mozconfig
thunderbird/macosx/comm-1.9.2/nightly/mozconfig
thunderbird/macosx/comm-1.9.2/release/mozconfig
thunderbird/macosx/comm-1.9.2/unittest/mozconfig
thunderbird/macosx/comm-aurora/debug/mozconfig
thunderbird/macosx/comm-beta/debug/mozconfig
thunderbird/macosx/comm-central-tested
thunderbird/macosx/comm-central/debug/mozconfig
thunderbird/macosx/comm-esr10/debug/mozconfig
thunderbird/macosx/comm-release/debug/mozconfig
thunderbird/macosx/try/debug/mozconfig
thunderbird/macosx/try/nightly/mozconfig
thunderbird/macosx64/comm-aurora/debug/mozconfig
thunderbird/macosx64/comm-aurora/nightly/mozconfig
thunderbird/macosx64/comm-aurora/unittest/mozconfig
thunderbird/macosx64/comm-beta/debug/mozconfig
thunderbird/macosx64/comm-beta/l10n/mozconfig
thunderbird/macosx64/comm-beta/nightly/mozconfig
thunderbird/macosx64/comm-beta/release/mozconfig
thunderbird/macosx64/comm-beta/unittest/mozconfig
thunderbird/macosx64/comm-central-tested
thunderbird/macosx64/comm-central/debug/mozconfig
thunderbird/macosx64/comm-central/nightly/mozconfig
thunderbird/macosx64/comm-central/unittest/mozconfig
thunderbird/macosx64/comm-esr10/debug/mozconfig
thunderbird/macosx64/comm-esr10/l10n/mozconfig
thunderbird/macosx64/comm-esr10/nightly/mozconfig
thunderbird/macosx64/comm-esr10/release/mozconfig
thunderbird/macosx64/comm-release/debug/mozconfig
thunderbird/macosx64/comm-release/l10n/mozconfig
thunderbird/macosx64/comm-release/nightly/mozconfig
thunderbird/macosx64/comm-release/release/mozconfig
thunderbird/macosx64/comm-release/unittest/mozconfig
thunderbird/macosx64/try/debug/mozconfig
thunderbird/macosx64/try/nightly/mozconfig
thunderbird/master.cfg
thunderbird/mozillabuild.py
thunderbird/public_html/default.css
thunderbird/public_html/robots.txt
thunderbird/release_master.py
thunderbird/win32/comm-1.9.2/debug/mozconfig
thunderbird/win32/comm-1.9.2/l10n/mozconfig
thunderbird/win32/comm-1.9.2/nightly/mozconfig
thunderbird/win32/comm-1.9.2/release/mozconfig
thunderbird/win32/comm-1.9.2/unittest/mozconfig
thunderbird/win32/comm-aurora/debug/mozconfig
thunderbird/win32/comm-aurora/nightly/mozconfig
thunderbird/win32/comm-aurora/unittest/mozconfig
thunderbird/win32/comm-beta/debug/mozconfig
thunderbird/win32/comm-beta/l10n/mozconfig
thunderbird/win32/comm-beta/nightly/mozconfig
thunderbird/win32/comm-beta/release/mozconfig
thunderbird/win32/comm-beta/unittest/mozconfig
thunderbird/win32/comm-central-tested/debug/mozconfig
thunderbird/win32/comm-central-tested/nightly/mozconfig
thunderbird/win32/comm-central-tested/unittest/mozconfig
thunderbird/win32/comm-central/debug/mozconfig
thunderbird/win32/comm-central/nightly/mozconfig
thunderbird/win32/comm-central/unittest/mozconfig
thunderbird/win32/comm-esr10/debug/mozconfig
thunderbird/win32/comm-esr10/l10n/mozconfig
thunderbird/win32/comm-esr10/nightly/mozconfig
thunderbird/win32/comm-esr10/release/mozconfig
thunderbird/win32/comm-release/debug/mozconfig
thunderbird/win32/comm-release/l10n/mozconfig
thunderbird/win32/comm-release/nightly/mozconfig
thunderbird/win32/comm-release/release/mozconfig
thunderbird/win32/comm-release/unittest/mozconfig
thunderbird/win32/try/debug/mozconfig
thunderbird/win32/try/nightly/mozconfig
thunderbird/win64/comm-aurora/debug/mozconfig
thunderbird/win64/comm-aurora/nightly/mozconfig
thunderbird/win64/comm-beta/debug/mozconfig
thunderbird/win64/comm-beta/l10n/mozconfig
thunderbird/win64/comm-beta/nightly/mozconfig
thunderbird/win64/comm-central-tested/debug/mozconfig
thunderbird/win64/comm-central-tested/nightly/mozconfig
thunderbird/win64/comm-central/debug/mozconfig
thunderbird/win64/comm-central/nightly/mozconfig
thunderbird/win64/comm-release/debug/mozconfig
thunderbird/win64/comm-release/nightly/mozconfig
thunderbird/win64/try/debug/mozconfig
thunderbird/win64/try/nightly/mozconfig
--- a/.hgignore
+++ b/.hgignore
@@ -1,14 +1,15 @@
 \.orig$
 \.pyc$
 \.pck$
 twistd\.pid$
 twistd\.log$
 twistd\.log\.[0-9]+$
+test-output
 
 ^.*/BuildSlaves.py$
 ^.*/passwords.py$
 
 #XXX: Specific to slaves, needs another top-level container so we can
 #XXX: mass ignore it all
 ^thunderbird.*/comm-central-.*
 ^thunderbird.*/trunk-.*
--- a/.hgtags
+++ b/.hgtags
@@ -823,14 +823,707 @@ 7145411cb343533885e23242dc68870da096d794
 6b4f6987ecda55891b03e708b7eb64853d5f4bb4 FENNEC_10_0_3esr_BUILD1
 7145411cb343533885e23242dc68870da096d794 FENNEC_10_0_3esr_BUILD1
 06aec21cda52e695b51345655b2b70bb05e01e65 FIREFOX_11_0b6_RELEASE
 06aec21cda52e695b51345655b2b70bb05e01e65 FIREFOX_11_0b6_BUILD1
 06aec21cda52e695b51345655b2b70bb05e01e65 FENNEC_11_0b6_RELEASE
 06aec21cda52e695b51345655b2b70bb05e01e65 FENNEC_11_0b6_BUILD1
 6316413c208d524f1edc31b20f7bf60617e08aa8 FIREFOX_3_6_28_RELEASE
 6316413c208d524f1edc31b20f7bf60617e08aa8 FIREFOX_3_6_28_BUILD1
+f57becd7270be82d5fdfbf435d7c67abf58dbccf FIREFOX_11_0b7_RELEASE
+f57becd7270be82d5fdfbf435d7c67abf58dbccf FIREFOX_11_0b7_BUILD1
+5b10ef939b6c1f7c3ccb619fcb52b3168def3178 FIREFOX_11_0_RELEASE
+5b10ef939b6c1f7c3ccb619fcb52b3168def3178 FIREFOX_11_0_BUILD1
+7145411cb343533885e23242dc68870da096d794 FIREFOX_10_0_3esr_RELEASE
+60ce948b908af4be2f1c29702efad4f9fafb2680 FIREFOX_10_0_3esr_RELEASE
+60ce948b908af4be2f1c29702efad4f9fafb2680 FIREFOX_10_0_3esr_BUILD2
+7145411cb343533885e23242dc68870da096d794 FENNEC_10_0_3esr_RELEASE
+60ce948b908af4be2f1c29702efad4f9fafb2680 FENNEC_10_0_3esr_RELEASE
+60ce948b908af4be2f1c29702efad4f9fafb2680 FENNEC_10_0_3esr_BUILD2
+60ce948b908af4be2f1c29702efad4f9fafb2680 FENNEC_10_0_3esr_BUILD2
+0000000000000000000000000000000000000000 FENNEC_10_0_3esr_BUILD2
+60ce948b908af4be2f1c29702efad4f9fafb2680 FENNEC_10_0_3esr_RELEASE
+7145411cb343533885e23242dc68870da096d794 FENNEC_10_0_3esr_RELEASE
+389bd598b5a8e040ddf0d363a862150ce2e5712d FIREFOX_11_0b8_RELEASE
+389bd598b5a8e040ddf0d363a862150ce2e5712d FIREFOX_11_0b8_BUILD1
+5b10ef939b6c1f7c3ccb619fcb52b3168def3178 FIREFOX_11_0_RELEASE
+a7e3dc8cc1b77976e491e2d1620c0ede02f77e14 FIREFOX_11_0_RELEASE
+a7e3dc8cc1b77976e491e2d1620c0ede02f77e14 FIREFOX_11_0_BUILD2
+fc8d6714880fbefc11625aabccad9f993274cba2 FIREFOX_12_0b1_RELEASE
+fc8d6714880fbefc11625aabccad9f993274cba2 FIREFOX_12_0b1_BUILD1
+fc8d6714880fbefc11625aabccad9f993274cba2 FENNEC_12_0b1_RELEASE
+fc8d6714880fbefc11625aabccad9f993274cba2 FENNEC_12_0b1_BUILD1
+fc8d6714880fbefc11625aabccad9f993274cba2 FIREFOX_12_0b1_RELEASE
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FIREFOX_12_0b1_RELEASE
+fc8d6714880fbefc11625aabccad9f993274cba2 FIREFOX_12_0b1_BUILD1
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FIREFOX_12_0b1_BUILD1
+fc8d6714880fbefc11625aabccad9f993274cba2 FENNEC_12_0b1_RELEASE
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FENNEC_12_0b1_RELEASE
+fc8d6714880fbefc11625aabccad9f993274cba2 FENNEC_12_0b1_BUILD1
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FENNEC_12_0b1_BUILD1
 c2eb1b53117d88e3384c7026a36873aadec83222 THUNDERBIRD_12_0b1_RELEASE
 c2eb1b53117d88e3384c7026a36873aadec83222 THUNDERBIRD_12_0b1_BUILD1
 c2eb1b53117d88e3384c7026a36873aadec83222 THUNDERBIRD_12_0b1_RELEASE
 8c40868c10184b32e6c52eef61eba9e466b40055 THUNDERBIRD_12_0b1_RELEASE
 8c40868c10184b32e6c52eef61eba9e466b40055 THUNDERBIRD_12_0b1_BUILD2
 75146a9f219d9f2932c42f480f0e37c67c4cdc3e SEAMONKEY_2_13b5_RELEASE
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FIREFOX_12_0b1_RELEASE
+2443b9944da0748155bef804f06102d7cc436684 FIREFOX_12_0b1_RELEASE
+2443b9944da0748155bef804f06102d7cc436684 FIREFOX_12_0b1_BUILD2
+76ec2fdb4f6f628ec7b39595ebcabc1f8e5a5316 FENNEC_12_0b1_RELEASE
+2443b9944da0748155bef804f06102d7cc436684 FENNEC_12_0b1_RELEASE
+2443b9944da0748155bef804f06102d7cc436684 FENNEC_12_0b1_BUILD2
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FIREFOX_12_0b2_RELEASE
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FIREFOX_12_0b2_BUILD1
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FENNEC_12_0b2_RELEASE
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FENNEC_12_0b2_BUILD1
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FENNEC_12_0b2_RELEASE
+0273beb68a6d3cc35de3fcd7f790e72bbf5b42f4 FENNEC_12_0b2_RELEASE
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FENNEC_12_0b2_BUILD1
+0273beb68a6d3cc35de3fcd7f790e72bbf5b42f4 FENNEC_12_0b2_BUILD1
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FIREFOX_12_0b2_RELEASE
+0273beb68a6d3cc35de3fcd7f790e72bbf5b42f4 FIREFOX_12_0b2_RELEASE
+0758846c1f0ef4387a781b32156e25c5ee1c5a46 FIREFOX_12_0b2_BUILD1
+0273beb68a6d3cc35de3fcd7f790e72bbf5b42f4 FIREFOX_12_0b2_BUILD1
+f326cef2773d9759db00decddb0f38462affa238 THUNDERBIRD_12_0b2_RELEASE
+f326cef2773d9759db00decddb0f38462affa238 THUNDERBIRD_12_0b2_BUILD1
+1cbd3aa791e47ecfdf65cba731d5e9950b487aba THUNDERBIRD_11_0_1_RELEASE
+1cbd3aa791e47ecfdf65cba731d5e9950b487aba THUNDERBIRD_11_0_1_BUILD1
+69460b90951f5530158e69e312ab34df03491b56 FIREFOX_12_0b3_RELEASE
+69460b90951f5530158e69e312ab34df03491b56 FIREFOX_12_0b3_BUILD1
+69460b90951f5530158e69e312ab34df03491b56 FENNEC_12_0b3_RELEASE
+69460b90951f5530158e69e312ab34df03491b56 FENNEC_12_0b3_BUILD1
+977368ddfa8b64b3336bc209c37dc11cf5f4371b THUNDERBIRD_12_0b3_RELEASE
+977368ddfa8b64b3336bc209c37dc11cf5f4371b THUNDERBIRD_12_0b3_BUILD1
+977368ddfa8b64b3336bc209c37dc11cf5f4371b THUNDERBIRD_12_0b3_RELEASE
+e8647fb3daf2f0f25f4837771c7d0c224718ab4a THUNDERBIRD_12_0b3_RELEASE
+977368ddfa8b64b3336bc209c37dc11cf5f4371b THUNDERBIRD_12_0b3_BUILD1
+e8647fb3daf2f0f25f4837771c7d0c224718ab4a THUNDERBIRD_12_0b3_BUILD1
+33a085704b4dc051cf292246630dd13544f28f64 FIREFOX_12_0b4_BUILD1
+33a085704b4dc051cf292246630dd13544f28f64 FIREFOX_12_0b4_RELEASE
+33a085704b4dc051cf292246630dd13544f28f64 FENNEC_12_0b4_BUILD1
+33a085704b4dc051cf292246630dd13544f28f64 FENNEC_12_0b4_RELEASE
+f520092ab341dce8c3b1804a0a580a9dc5f7c24a FIREFOX_12_0b5_BUILD1
+f520092ab341dce8c3b1804a0a580a9dc5f7c24a FIREFOX_12_0b5_RELEASE
+f520092ab341dce8c3b1804a0a580a9dc5f7c24a FENNEC_12_0b5_BUILD1
+f520092ab341dce8c3b1804a0a580a9dc5f7c24a FENNEC_12_0b5_RELEASE
+3d143e6f76f2e58b8990f73bc995d3a7a01c0f81 THUNDERBIRD_12_0b4_RELEASE
+3d143e6f76f2e58b8990f73bc995d3a7a01c0f81 THUNDERBIRD_12_0b4_BUILD1
+d39ab27701c8d82b9337562b398fd38d37555636 FIREFOX_12_0b6_RELEASE
+d39ab27701c8d82b9337562b398fd38d37555636 FIREFOX_12_0b6_BUILD1
+d39ab27701c8d82b9337562b398fd38d37555636 FENNEC_12_0b6_RELEASE
+d39ab27701c8d82b9337562b398fd38d37555636 FENNEC_12_0b6_BUILD1
+7e9bb41f20705fda0bcc3e6444b8a53731b09e44 THUNDERBIRD_12_0b5_RELEASE
+7e9bb41f20705fda0bcc3e6444b8a53731b09e44 THUNDERBIRD_12_0b5_BUILD1
+a87459ee208cdb06d371fa68a875ce4be65579b1 FIREFOX_12_0_RELEASE
+a87459ee208cdb06d371fa68a875ce4be65579b1 FIREFOX_12_0_BUILD1
+c976205ff210d11d24d8f02e5b26e0e1ab52d2da THUNDERBIRD_12_0_RELEASE
+c976205ff210d11d24d8f02e5b26e0e1ab52d2da THUNDERBIRD_12_0_BUILD1
+c976205ff210d11d24d8f02e5b26e0e1ab52d2da THUNDERBIRD_12_0_RELEASE
+6cceadcae9f539b3800616d27d3b791e26e99d52 THUNDERBIRD_12_0_RELEASE
+c976205ff210d11d24d8f02e5b26e0e1ab52d2da THUNDERBIRD_12_0_BUILD1
+6cceadcae9f539b3800616d27d3b791e26e99d52 THUNDERBIRD_12_0_BUILD1
+14ea154b4ce07969b5211734e62bd043cff6bc96 FIREFOX_10_0_4esr_RELEASE
+14ea154b4ce07969b5211734e62bd043cff6bc96 FIREFOX_10_0_4esr_BUILD1
+14ea154b4ce07969b5211734e62bd043cff6bc96 FENNEC_10_0_4esr_RELEASE
+14ea154b4ce07969b5211734e62bd043cff6bc96 FENNEC_10_0_4esr_BUILD1
+ef3f61f598a603577f5c83975aad1b74c664ee79 THUNDERBIRD_10_0_4esr_RELEASE
+ef3f61f598a603577f5c83975aad1b74c664ee79 THUNDERBIRD_10_0_4esr_BUILD1
+405b2f4373f25883c78afad6fb71198f513c026d FIREFOX_13_0b1_BUILD1
+405b2f4373f25883c78afad6fb71198f513c026d FIREFOX_13_0b1_RELEASE
+405b2f4373f25883c78afad6fb71198f513c026d FENNEC_13_0b1_BUILD1
+405b2f4373f25883c78afad6fb71198f513c026d FENNEC_13_0b1_RELEASE
+fcab65d66e50d88cec2694bb045f384fbf5b91f8 THUNDERBIRD_13_0b1_RELEASE
+fcab65d66e50d88cec2694bb045f384fbf5b91f8 THUNDERBIRD_13_0b1_BUILD1
+a44ad99a2b7871ce035564bcb02b630c2774af5d FENNEC_13_0b1_RELEASE
+394a63c870dec0418a79cd9b9f338debb5fcda12 FENNEC_13_0b1_RELEASE
+394a63c870dec0418a79cd9b9f338debb5fcda12 FENNEC_13_0b1_BUILD2
+394a63c870dec0418a79cd9b9f338debb5fcda12 FENNEC_13_0b1_RELEASE
+34dea782352aa98fa4dc528660bb53494e955b3f FENNEC_13_0b1_RELEASE
+394a63c870dec0418a79cd9b9f338debb5fcda12 FENNEC_13_0b1_BUILD2
+34dea782352aa98fa4dc528660bb53494e955b3f FENNEC_13_0b1_BUILD2
+14ea154b4ce07969b5211734e62bd043cff6bc96 FENNEC_10_0_4esr_RELEASE
+b7e7bf04ad3450c9f6292bd5179463575eba8439 FENNEC_10_0_4esr_RELEASE
+b7e7bf04ad3450c9f6292bd5179463575eba8439 FENNEC_10_0_4esr_BUILD2
+5f6bbe4efc1555a62e54e58c44ae3904ce11d56c FIREFOX_13_0b4_BUILD1
+5f6bbe4efc1555a62e54e58c44ae3904ce11d56c FIREFOX_13_0b4_BUILD1
+94e004b28d584351790dccb00215c7c08ecf3db6 FIREFOX_13_0b4_BUILD1
+2c8ddc1c118bb392b585c80dfcb59cbbebf41efd FIREFOX_13_0b4_RELEASE
+2c8ddc1c118bb392b585c80dfcb59cbbebf41efd FIREFOX_13_0b4_RELEASE
+94e004b28d584351790dccb00215c7c08ecf3db6 FIREFOX_13_0b4_RELEASE
+94e004b28d584351790dccb00215c7c08ecf3db6 FIREFOX_13_0b4_RELEASE
+cf767826773c3771325692e73486f0fcc4af9444 FIREFOX_13_0b4_RELEASE
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_RE
+cf767826773c3771325692e73486f0fcc4af9444 FIREFOX_13_0b4_RELEASE
+409f22fffc0dc6ec77322614d5ddc7ef380d479b FIREFOX_13_0b4_RELEASE
+94e004b28d584351790dccb00215c7c08ecf3db6 FIREFOX_13_0b4_BUILD1
+9cdd6f7684e8bc3524c48ee653036d366c9227c3 FIREFOX_13_0b4_BUILD1
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_RE
+0000000000000000000000000000000000000000 FIREFOX_13_0b4_RE
+9cdd6f7684e8bc3524c48ee653036d366c9227c3 FIREFOX_13_0b4_BUILD1
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_BUILD1
+409f22fffc0dc6ec77322614d5ddc7ef380d479b FIREFOX_13_0b4_RELEASE
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_RELEASE
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_RELEASE
+85117fa6cf06338ed6d90d9943fa78a3dab94426 FIREFOX_13_0b4_RELEASE
+b62dd39a10114112b876952f29a11758cc7f92e8 FIREFOX_13_0b4_BUILD1
+85117fa6cf06338ed6d90d9943fa78a3dab94426 FIREFOX_13_0b4_BUILD1
+d944b981290430b126718773f933399e522e2f43 FIREFOX_10_0_5esr_RELEASE
+d944b981290430b126718773f933399e522e2f43 FIREFOX_10_0_5esr_BUILD1
+d944b981290430b126718773f933399e522e2f43 FENNEC_10_0_5esr_RELEASE
+d944b981290430b126718773f933399e522e2f43 FENNEC_10_0_5esr_BUILD1
+7ee65ac4f4ebc1250f71312429d7c238669b7402 THUNDERBIRD_14_0b1_RELEASE
+9d7abd539fb82ca378b9f09df581cef23a48dd8c THUNDERBIRD_14_0b1_BUILD1
+7ee65ac4f4ebc1250f71312429d7c238669b7402 THUNDERBIRD_14_0b1_RELEASE
+0000000000000000000000000000000000000000 THUNDERBIRD_14_0b1_RELEASE
+9d7abd539fb82ca378b9f09df581cef23a48dd8c THUNDERBIRD_14_0b1_BUILD1
+0000000000000000000000000000000000000000 THUNDERBIRD_14_0b1_BUILD1
+e38717575c5164aa68564074f5117f2721d13f5c THUNDERBIRD_14_0b1_RELEASE
+4d1568443e6436e4230b4b156551247c36baee47 THUNDERBIRD_14_0b1_RELEASE
+465bef29e2a00c379f177b564875b142f3697938 THUNDERBIRD_14_0b1_BUILD2
+269cb332a9564a382022f030d73f974f16e10a25 THUNDERBIRD_14_0b1_BUILD2
+5e2fe0bd3debc7896a7ec2bacdb2964c7fc67b48 THUNDERBIRD_14_0b3_RELEASE
+5e2fe0bd3debc7896a7ec2bacdb2964c7fc67b48 THUNDERBIRD_14_0b3_BUILD1
+b2b6a37879f23438c3fb29124f9b3d37e61cff13 THUNDERBIRD_10_0_6esr_RELEASE
+b2b6a37879f23438c3fb29124f9b3d37e61cff13 THUNDERBIRD_10_0_6esr_BUILD1
+7dd195a85c3110d4283a1fc74489d8f9eedab9bc THUNDERBIRD_16_0b3_RELEASE
+7dd195a85c3110d4283a1fc74489d8f9eedab9bc THUNDERBIRD_16_0b3_BUILD1
+1405b56f7c6e5d04fac2780ad2aa62ddee6dec21 FIREFOX_16_0b5_RELEASE
+1405b56f7c6e5d04fac2780ad2aa62ddee6dec21 FIREFOX_16_0b5_BUILD1
+1405b56f7c6e5d04fac2780ad2aa62ddee6dec21 FENNEC_16_0b5_RELEASE
+1405b56f7c6e5d04fac2780ad2aa62ddee6dec21 FENNEC_16_0b5_BUILD1
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FIREFOX_16_0b6_BUILD1
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FIREFOX_16_0b6_RELEASE
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FENNEC_16_0b6_BUILD1
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FENNEC_16_0b6_RELEASE
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FENNEC_16_0b6_BUILD1
+5793d15312469af5bc69af15525a3a50653a8085 FENNEC_16_0b6_BUILD1
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FENNEC_16_0b6_RELEASE
+5793d15312469af5bc69af15525a3a50653a8085 FENNEC_16_0b6_RELEASE
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FIREFOX_16_0b6_BUILD1
+5793d15312469af5bc69af15525a3a50653a8085 FIREFOX_16_0b6_BUILD1
+c512f56031b4d39f6a1b9d08b70cdf6fdedd4d7f FIREFOX_16_0b6_RELEASE
+5793d15312469af5bc69af15525a3a50653a8085 FIREFOX_16_0b6_RELEASE
+5793d15312469af5bc69af15525a3a50653a8085 FENNEC_16_0b6_BUILD1
+a537fe83c9affc3cd3fc08918ebd13f4eeb88c50 FENNEC_16_0b6_BUILD1
+5793d15312469af5bc69af15525a3a50653a8085 FENNEC_16_0b6_RELEASE
+a537fe83c9affc3cd3fc08918ebd13f4eeb88c50 FENNEC_16_0b6_RELEASE
+5793d15312469af5bc69af15525a3a50653a8085 FIREFOX_16_0b6_BUILD1
+a537fe83c9affc3cd3fc08918ebd13f4eeb88c50 FIREFOX_16_0b6_BUILD1
+5793d15312469af5bc69af15525a3a50653a8085 FIREFOX_16_0b6_RELEASE
+a537fe83c9affc3cd3fc08918ebd13f4eeb88c50 FIREFOX_16_0b6_RELEASE
+443042fab247aeed99ada6f2ee67bb1968a8c190 THUNDERBIRD_16_0b4_BUILD1
+443042fab247aeed99ada6f2ee67bb1968a8c190 THUNDERBIRD_16_0b4_RELEASE
+70c31c893794b3369d214ddb67142abba151437c THUNDEBIRD_16_0b4_RELEASE
+70c31c893794b3369d214ddb67142abba151437c THUNDEBIRD_16_0b4_BUILD1
+443042fab247aeed99ada6f2ee67bb1968a8c190 THUNDERBIRD_16_0b4_RELEASE
+b3121da060bbd9882d88df1e501b35c09252dcb4 THUNDERBIRD_16_0b4_RELEASE
+443042fab247aeed99ada6f2ee67bb1968a8c190 THUNDERBIRD_16_0b4_BUILD1
+b3121da060bbd9882d88df1e501b35c09252dcb4 THUNDERBIRD_16_0b4_BUILD1
+f42cb7b4cc5d78b5512439e05c8812016ad6e658 THUNDERBIRD_16_0_RELEASE
+f42cb7b4cc5d78b5512439e05c8812016ad6e658 THUNDERBIRD_16_0_BUILD1
+c01a1d49e3588e4081d16332371a1beaca48948b FIREFOX_10_0_8esr_RELEASE
+c01a1d49e3588e4081d16332371a1beaca48948b FIREFOX_10_0_8esr_BUILD1
+d1c6fb82ab7d448df74420ca92b79bdfb9ab71bd FENNEC_16_0_RELEASE
+9554afc5b3b2b2d4398255aacf092e5d778f6606 FIREFOX_16_0_BUILD1
+32017837378407b8f048194243a4b175504596ee FENNEC_16_0_BUILD1
+8f82bc9c680d66a9adb8a3c389a1ee4097e1d0f6 FIREFOX_16_0_RELEASE
+a0a64806701f5a02532ca9592a623c5d4e39498f THUNDERBIRD_10_0_8esr_RELEASE
+a0a64806701f5a02532ca9592a623c5d4e39498f THUNDERBIRD_10_0_8esr_BUILD1
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FIREFOX_17_0b1_BUILD1
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FIREFOX_17_0b1_RELEASE
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FENNEC_17_0b1_BUILD1
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FENNEC_17_0b1_RELEASE
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FIREFOX_17_0b1_BUILD1
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FIREFOX_17_0b1_BUILD1
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FIREFOX_17_0b1_RELEASE
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FIREFOX_17_0b1_RELEASE
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FENNEC_17_0b1_BUILD1
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FENNEC_17_0b1_BUILD1
+3fbb96c60ae24ea60cedc9133a2af31049321e00 FENNEC_17_0b1_RELEASE
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FENNEC_17_0b1_RELEASE
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FIREFOX_17_0b1_BUILD1
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FIREFOX_17_0b1_BUILD1
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FIREFOX_17_0b1_RELEASE
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FIREFOX_17_0b1_RELEASE
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FENNEC_17_0b1_BUILD1
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FENNEC_17_0b1_BUILD1
+e3d85e74c4816828487b0a75fe83ee9faaf11840 FENNEC_17_0b1_RELEASE
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FENNEC_17_0b1_RELEASE
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FIREFOX_17_0b1_BUILD1
+99efcecc96a83c52c91d38515e600938729c8edc FIREFOX_17_0b1_BUILD1
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FIREFOX_17_0b1_RELEASE
+99efcecc96a83c52c91d38515e600938729c8edc FIREFOX_17_0b1_RELEASE
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FENNEC_17_0b1_BUILD1
+99efcecc96a83c52c91d38515e600938729c8edc FENNEC_17_0b1_BUILD1
+af0c4d27c0aec94e878caf0bbc25dfbaa4420bfd FENNEC_17_0b1_RELEASE
+99efcecc96a83c52c91d38515e600938729c8edc FENNEC_17_0b1_RELEASE
+99efcecc96a83c52c91d38515e600938729c8edc FIREFOX_17_0b1_RELEASE
+e0994e97bf3a0820da19128027c7c11b9ed3a179 FIREFOX_17_0b1_RELEASE
+99efcecc96a83c52c91d38515e600938729c8edc FIREFOX_17_0b1_BUILD1
+e0994e97bf3a0820da19128027c7c11b9ed3a179 FIREFOX_17_0b1_BUILD1
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FIREFOX_16_0_1_RELEASE
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FIREFOX_16_0_1_BUILD1
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FENNEC_16_0_1_RELEASE
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FENNEC_16_0_1_BUILD1
+e0994e97bf3a0820da19128027c7c11b9ed3a179 FIREFOX_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FIREFOX_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FIREFOX_17_0b1_BUILD2
+99efcecc96a83c52c91d38515e600938729c8edc FENNEC_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FENNEC_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FENNEC_17_0b1_BUILD2
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FIREFOX_17_0b1_RELEASE
+6875393c4283d99021c4db756fb4d0699ab91b38 FIREFOX_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FIREFOX_17_0b1_BUILD2
+6875393c4283d99021c4db756fb4d0699ab91b38 FIREFOX_17_0b1_BUILD2
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FENNEC_17_0b1_RELEASE
+6875393c4283d99021c4db756fb4d0699ab91b38 FENNEC_17_0b1_RELEASE
+ca0d190207de8ad20392acd62a37abb2ba2aa174 FENNEC_17_0b1_BUILD2
+6875393c4283d99021c4db756fb4d0699ab91b38 FENNEC_17_0b1_BUILD2
+a64d0f796ab34cb014410cd494ca670687ccd242 THUNDERBIRD_16_0_1_BUILD1
+a64d0f796ab34cb014410cd494ca670687ccd242 THUNDERBIRD_16_0_1_RELEASE
+a64d0f796ab34cb014410cd494ca670687ccd242 THUNDERBIRD_16_0_1_RELEASE
+5ff083d935d546ad6cee1c41a3d0159abd756c9c THUNDERBIRD_16_0_1_RELEASE
+a64d0f796ab34cb014410cd494ca670687ccd242 THUNDERBIRD_16_0_1_BUILD1
+5ff083d935d546ad6cee1c41a3d0159abd756c9c THUNDERBIRD_16_0_1_BUILD1
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FIREFOX_16_0_1_RELEASE
+5ff083d935d546ad6cee1c41a3d0159abd756c9c FIREFOX_16_0_1_RELEASE
+9e33403dacebb98bdd30ed611580432b4c0a57b3 FIREFOX_16_0_1_BUILD1
+5ff083d935d546ad6cee1c41a3d0159abd756c9c FIREFOX_16_0_1_BUILD1
+8ab149d4f94a932417118ded29ec4f8c744eeda9 THUNDERBIRD_17_0b1_BUILD1
+8ab149d4f94a932417118ded29ec4f8c744eeda9 THUNDERBIRD_17_0b1_RELEASE
+6875393c4283d99021c4db756fb4d0699ab91b38 FENNEC_17_0b1_RELEASE
+fbb301884dff21ec24a0911032a104638f6c8c50 FENNEC_17_0b1_RELEASE
+6875393c4283d99021c4db756fb4d0699ab91b38 FENNEC_17_0b1_BUILD2
+fbb301884dff21ec24a0911032a104638f6c8c50 FENNEC_17_0b1_BUILD2
+8ab149d4f94a932417118ded29ec4f8c744eeda9 THUNDERBIRD_17_0b1_BUILD1
+fcaa896de8267c915b2eef8c094d378adde63d5b THUNDERBIRD_17_0b1_BUILD1
+8ab149d4f94a932417118ded29ec4f8c744eeda9 THUNDERBIRD_17_0b1_RELEASE
+fcaa896de8267c915b2eef8c094d378adde63d5b THUNDERBIRD_17_0b1_RELEASE
+c0e2e5ecfc90f466edb898d6a425955631e4f8e4 FIREFOX_10_0_9esr_RELEASE
+c0e2e5ecfc90f466edb898d6a425955631e4f8e4 FIREFOX_10_0_9esr_BUILD1
+0b63df664b8bda0f364f0222c8546307f63511db THUNDERBIRD_10_0_9esr_RELEASE
+0b63df664b8bda0f364f0222c8546307f63511db THUNDERBIRD_10_0_9esr_BUILD1
+0b63df664b8bda0f364f0222c8546307f63511db THUNDERBIRD_10_0_9esr_RELEASE
+7727ed5d709ebd2eec8cd2179cea3308332d8f03 THUNDERBIRD_10_0_9esr_RELEASE
+0b63df664b8bda0f364f0222c8546307f63511db THUNDERBIRD_10_0_9esr_BUILD1
+7727ed5d709ebd2eec8cd2179cea3308332d8f03 THUNDERBIRD_10_0_9esr_BUILD1
+c0e2e5ecfc90f466edb898d6a425955631e4f8e4 FIREFOX_10_0_9esr_RELEASE
+a8130ed90a3beb0d7f9f53c81ef7e1e39f8729ce FIREFOX_10_0_9esr_RELEASE
+c0e2e5ecfc90f466edb898d6a425955631e4f8e4 FIREFOX_10_0_9esr_BUILD1
+a8130ed90a3beb0d7f9f53c81ef7e1e39f8729ce FIREFOX_10_0_9esr_BUILD1
+5cc47457948b0a5bbbb5b6b4a258ed037307ad63 FIREFOX_17_0b2_RELEASE
+5cc47457948b0a5bbbb5b6b4a258ed037307ad63 FIREFOX_17_0b2_BUILD1
+5cc47457948b0a5bbbb5b6b4a258ed037307ad63 FENNEC_17_0b2_RELEASE
+5cc47457948b0a5bbbb5b6b4a258ed037307ad63 FENNEC_17_0b2_BUILD1
+32c2bfc55ffab717a9984cb068928e4fbc176bfe FENNEC_17_0b2_BUILD2
+5cc47457948b0a5bbbb5b6b4a258ed037307ad63 FENNEC_17_0b2_RELEASE
+32c2bfc55ffab717a9984cb068928e4fbc176bfe FENNEC_17_0b2_RELEASE
+73ed29563a89f58715038b35a5576a271c5af627 FIREFOX_17_0b3_RELEASE
+73ed29563a89f58715038b35a5576a271c5af627 FIREFOX_17_0b3_BUILD1
+73ed29563a89f58715038b35a5576a271c5af627 FENNEC_17_0b3_RELEASE
+73ed29563a89f58715038b35a5576a271c5af627 FENNEC_17_0b3_BUILD1
+9cc04689a95874166679aeea5f356d60b14e4e2a FIREFOX_16_0_2_RELEASE
+9cc04689a95874166679aeea5f356d60b14e4e2a FIREFOX_16_0_2_BUILD1
+9cc04689a95874166679aeea5f356d60b14e4e2a FENNEC_16_0_2_RELEASE
+9cc04689a95874166679aeea5f356d60b14e4e2a FENNEC_16_0_2_BUILD1
+93c898a2505c9630b39a7743acce0bdbfc4c8d76 FIREFOX_10_0_10esr_RELEASE
+93c898a2505c9630b39a7743acce0bdbfc4c8d76 FIREFOX_10_0_10esr_BUILD1
+22e4e014082fde87520d1892a34fd6a64ee4ee84 THUNDERBIRD_10_0_10esr_RELEASE
+22e4e014082fde87520d1892a34fd6a64ee4ee84 THUNDERBIRD_10_0_10esr_BUILD1
+3e8a541a89d8316cd1d4976e88763460bc241cce THUNDERBIRD_16_0_2_RELEASE
+3e8a541a89d8316cd1d4976e88763460bc241cce THUNDERBIRD_16_0_2_BUILD1
+7c3f19dda1d87eeba1e2110af6614a0fa40f187a THUNDERBIRD_17_0b2_RELEASE
+7c3f19dda1d87eeba1e2110af6614a0fa40f187a THUNDERBIRD_17_0b2_BUILD1
+6bd2ae992d9f70ef5f3844682497bc8267efa3d9 FENNEC_17_0b4_RELEASE
+6bd2ae992d9f70ef5f3844682497bc8267efa3d9 FENNEC_17_0b4_BUILD1
+6bd2ae992d9f70ef5f3844682497bc8267efa3d9 FENNEC_17_0b4_RELEASE
+0000000000000000000000000000000000000000 FENNEC_17_0b4_RELEASE
+6bd2ae992d9f70ef5f3844682497bc8267efa3d9 FENNEC_17_0b4_BUILD1
+0000000000000000000000000000000000000000 FENNEC_17_0b4_BUILD1
+0000000000000000000000000000000000000000 FENNEC_17_0b4_RELEASE
+49907ee9c582ba255cb21b5fc661b3e136d9b1f7 FENNEC_17_0b4_RELEASE
+0000000000000000000000000000000000000000 FENNEC_17_0b4_BUILD1
+49907ee9c582ba255cb21b5fc661b3e136d9b1f7 FENNEC_17_0b4_BUILD1
+343dc4bbd8f8a761396b2153c655818345336b5a FIREFOX_17_0b4_RELEASE
+343dc4bbd8f8a761396b2153c655818345336b5a FIREFOX_17_0b4_BUILD1
+ea89e9fae629c6cddeede2df3355791cfb583d44 FENNEC_17_0b5_RELEASE
+ea89e9fae629c6cddeede2df3355791cfb583d44 FENNEC_17_0b5_BUILD1
+5d2328936b6329cef135ba6bb117d669604ed21b FIREFOX_17_0b5_RELEASE
+5d2328936b6329cef135ba6bb117d669604ed21b FIREFOX_17_0b5_BUILD1
+9dc1bf68dc6b060945747fcc3d253f042646d94d FENNEC_17_0b6_RELEASE
+9dc1bf68dc6b060945747fcc3d253f042646d94d FENNEC_17_0b6_BUILD1
+9dc1bf68dc6b060945747fcc3d253f042646d94d FENNEC_17_0b6_RELEASE
+0000000000000000000000000000000000000000 FENNEC_17_0b6_RELEASE
+9dc1bf68dc6b060945747fcc3d253f042646d94d FENNEC_17_0b6_BUILD1
+0000000000000000000000000000000000000000 FENNEC_17_0b6_BUILD1
+0000000000000000000000000000000000000000 FENNEC_17_0b6_RELEASE
+cb1217c7f062214a3fa35946af29d3e60a3562d9 FENNEC_17_0b6_RELEASE
+0000000000000000000000000000000000000000 FENNEC_17_0b6_BUILD1
+cb1217c7f062214a3fa35946af29d3e60a3562d9 FENNEC_17_0b6_BUILD1
+c07480ee84b255a693482aa9901c5a7b36f3c00d FIREFOX_17_0b6_RELEASE
+c07480ee84b255a693482aa9901c5a7b36f3c00d FIREFOX_17_0b6_BUILD1
+b3bb70c61dc6c34f74713f1fd66720e307a149a9 THUNDERBIRD_17_0b3_RELEASE
+b3bb70c61dc6c34f74713f1fd66720e307a149a9 THUNDERBIRD_17_0b3_BUILD1
+cb1217c7f062214a3fa35946af29d3e60a3562d9 FENNEC_17_0b6_RELEASE
+6b8cb0ad8a32ffecd4fc8726d5c8e58e1bff9bc8 FENNEC_17_0b6_RELEASE
+6b8cb0ad8a32ffecd4fc8726d5c8e58e1bff9bc8 FENNEC_17_0b6_BUILD2
+c80855e415e40c829636abb186682a6a6b6e2f10 FIREFOX_10_0_11esr_RELEASE
+c80855e415e40c829636abb186682a6a6b6e2f10 FIREFOX_10_0_11esr_BUILD1
+5963bd5d070147697a8c3879f1ae4476340a82fd THUNDERBIRD_10_0_11esr_RELEASE
+5963bd5d070147697a8c3879f1ae4476340a82fd THUNDERBIRD_10_0_11esr_BUILD1
+a444a95ddb4a7a90785a792f05d9e941af71a4b0 FENNEC_17_0b7_RELEASE
+a444a95ddb4a7a90785a792f05d9e941af71a4b0 FENNEC_17_0b7_BUILD1
+594280a61722bfcb7c547c0d9589a19bbbbc7e39 FENNEC_17_0_RELEASE
+594280a61722bfcb7c547c0d9589a19bbbbc7e39 FENNEC_17_0_BUILD1
+0912a2726eecb4d2a214ea30e776423f928ed9fe FIREFOX_17_0_RELEASE
+0912a2726eecb4d2a214ea30e776423f928ed9fe FIREFOX_17_0_BUILD1
+cde20b5649d021bf8b0f436d44214ec54d52d6d2 FIREFOX_17_0esr_RELEASE
+cde20b5649d021bf8b0f436d44214ec54d52d6d2 FIREFOX_17_0esr_BUILD1
+6aa77d97e491ff366d5702eb6b34bcdca03b20a9 THUNDERBIRD_17_0esr_RELEASE
+6aa77d97e491ff366d5702eb6b34bcdca03b20a9 THUNDERBIRD_17_0esr_BUILD1
+e4c8439858be098b00a4419738df80452d58d3ed THUNDERBIRD_17_0_RELEASE
+e4c8439858be098b00a4419738df80452d58d3ed THUNDERBIRD_17_0_BUILD1
+594280a61722bfcb7c547c0d9589a19bbbbc7e39 FENNEC_17_0_BUILD1
+4e35e2b2d27d7a2fa2d96f5fddacfbe1d85cf300 FENNEC_17_0_BUILD1
+594280a61722bfcb7c547c0d9589a19bbbbc7e39 FENNEC_17_0_RELEASE
+4e35e2b2d27d7a2fa2d96f5fddacfbe1d85cf300 FENNEC_17_0_RELEASE
+4e35e2b2d27d7a2fa2d96f5fddacfbe1d85cf300 FENNEC_17_0_BUILD1
+591d6810269b2297d422c2e8e0d42b2ad5f4d65e FENNEC_17_0_BUILD1
+4e35e2b2d27d7a2fa2d96f5fddacfbe1d85cf300 FENNEC_17_0_RELEASE
+591d6810269b2297d422c2e8e0d42b2ad5f4d65e FENNEC_17_0_RELEASE
+e4c8439858be098b00a4419738df80452d58d3ed THUNDERBIRD_17_0_RELEASE
+79137e5e3d8335aa5e31bf9398974b499b53ce84 THUNDERBIRD_17_0_RELEASE
+79137e5e3d8335aa5e31bf9398974b499b53ce84 THUNDERBIRD_17_0_BUILD2
+6aa77d97e491ff366d5702eb6b34bcdca03b20a9 THUNDERBIRD_17_0esr_RELEASE
+9694ac71d10356e230263c41fa5de63395fd49e1 THUNDERBIRD_17_0esr_RELEASE
+9694ac71d10356e230263c41fa5de63395fd49e1 THUNDERBIRD_17_0esr_BUILD2
+cde20b5649d021bf8b0f436d44214ec54d52d6d2 FIREFOX_17_0esr_RELEASE
+f496a2239b0a2ef1d2119e688d2fbd54f7a22e23 FIREFOX_17_0esr_RELEASE
+f496a2239b0a2ef1d2119e688d2fbd54f7a22e23 FIREFOX_17_0esr_BUILD2
+9694ac71d10356e230263c41fa5de63395fd49e1 THUNDERBIRD_17_0esr_RELEASE
+32bb8d3df35c476ac520ac84fe542fa4e98808bb THUNDERBIRD_17_0esr_RELEASE
+32bb8d3df35c476ac520ac84fe542fa4e98808bb THUNDERBIRD_17_0esr_BUILD3
+32bb8d3df35c476ac520ac84fe542fa4e98808bb THUNDERBIRD_17_0esr_RELEASE
+769044cda9ff906efb702b6b1e7327a89564cb3e THUNDERBIRD_17_0esr_RELEASE
+769044cda9ff906efb702b6b1e7327a89564cb3e THUNDERBIRD_17_0esr_BUILD4
+0912a2726eecb4d2a214ea30e776423f928ed9fe FIREFOX_17_0_RELEASE
+ad577b3b191913801bd48397eeb5f558709415e2 FIREFOX_17_0_RELEASE
+ad577b3b191913801bd48397eeb5f558709415e2 FIREFOX_17_0_BUILD2
+ae56aa536a1fbd42c7e72c023a4fd7a70cb3ec11 FENNEC_18_0b1_RELEASE
+ae56aa536a1fbd42c7e72c023a4fd7a70cb3ec11 FENNEC_18_0b1_BUILD1
+ae56aa536a1fbd42c7e72c023a4fd7a70cb3ec11 FENNEC_18_0b1_RELEASE
+0000000000000000000000000000000000000000 FENNEC_18_0b1_RELEASE
+ae56aa536a1fbd42c7e72c023a4fd7a70cb3ec11 FENNEC_18_0b1_BUILD1
+0000000000000000000000000000000000000000 FENNEC_18_0b1_BUILD1
+0000000000000000000000000000000000000000 FENNEC_18_0b1_RELEASE
+0fda65e9fe2cbf10afd78c07f311823d74feb0c8 FENNEC_18_0b1_RELEASE
+0000000000000000000000000000000000000000 FENNEC_18_0b1_BUILD1
+0fda65e9fe2cbf10afd78c07f311823d74feb0c8 FENNEC_18_0b1_BUILD1
+0fda65e9fe2cbf10afd78c07f311823d74feb0c8 FENNEC_18_0b1_RELEASE
+0000000000000000000000000000000000000000 FENNEC_18_0b1_RELEASE
+0fda65e9fe2cbf10afd78c07f311823d74feb0c8 FENNEC_18_0b1_BUILD1
+0000000000000000000000000000000000000000 FENNEC_18_0b1_BUILD1
+0000000000000000000000000000000000000000 FENNEC_18_0b1_RELEASE
+5747d030cde3543d3850ab8a76e7985f06579d16 FENNEC_18_0b1_RELEASE
+0000000000000000000000000000000000000000 FENNEC_18_0b1_BUILD1
+5747d030cde3543d3850ab8a76e7985f06579d16 FENNEC_18_0b1_BUILD1
+3f493558a5a7100fe410c664396666d2eb8f1ecb FIREFOX_18_0b1_RELEASE
+3f493558a5a7100fe410c664396666d2eb8f1ecb FIREFOX_18_0b1_BUILD1
+5747d030cde3543d3850ab8a76e7985f06579d16 FENNEC_18_0b1_BUILD1
+58e421f09dbcce3a30f5317e2b211345dd87f4e5 FENNEC_18_0b1_BUILD1
+5747d030cde3543d3850ab8a76e7985f06579d16 FENNEC_18_0b1_RELEASE
+58e421f09dbcce3a30f5317e2b211345dd87f4e5 FENNEC_18_0b1_RELEASE
+63aef25fab820c8ccc539e2744a93d2d15db4899 FENNEC_18_0b2_RELEASE
+63aef25fab820c8ccc539e2744a93d2d15db4899 FENNEC_18_0b2_BUILD1
+e3eadb99e5aae2b843c99a816089ab571a873ed6 FIREFOX_18_0b2_RELEASE
+e3eadb99e5aae2b843c99a816089ab571a873ed6 FIREFOX_18_0b2_BUILD1
+63aef25fab820c8ccc539e2744a93d2d15db4899 FENNEC_18_0b2_RELEASE
+f45ce93448a2f3a2c099aca15e2d06417d7ed288 FENNEC_18_0b2_RELEASE
+63aef25fab820c8ccc539e2744a93d2d15db4899 FENNEC_18_0b2_BUILD1
+f45ce93448a2f3a2c099aca15e2d06417d7ed288 FENNEC_18_0b2_BUILD1
+1a178e56fff27a3231cf5baa717dc3923b8857ea THUNDERBIRD_18_0b1_RELEASE
+1a178e56fff27a3231cf5baa717dc3923b8857ea THUNDERBIRD_18_0b1_BUILD1
+ea4cc24904d320ff9da2733f5223e3594bd0c335 FENNEC_17_0_1_RELEASE
+ea4cc24904d320ff9da2733f5223e3594bd0c335 FENNEC_17_0_1_BUILD1
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_RELEASE
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_BUILD1
+32f02108912678ded6481b78c235bb85dc293a6c FIREFOX_17_0_1esr_RELEASE
+32f02108912678ded6481b78c235bb85dc293a6c FIREFOX_17_0_1esr_BUILD1
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_RELEASE
+916e0d32fbee0b5a62fe8c5ddb4e17b783aa52a4 FIREFOX_17_0_1_RELEASE
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_BUILD1
+916e0d32fbee0b5a62fe8c5ddb4e17b783aa52a4 FIREFOX_17_0_1_BUILD1
+916e0d32fbee0b5a62fe8c5ddb4e17b783aa52a4 FIREFOX_17_0_1_RELEASE
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_RELEASE
+916e0d32fbee0b5a62fe8c5ddb4e17b783aa52a4 FIREFOX_17_0_1_BUILD1
+dac8166c253890d72e41eea2eb0b6c500f290134 FIREFOX_17_0_1_BUILD1
+1a178e56fff27a3231cf5baa717dc3923b8857ea THUNDERBIRD_18_0b1_RELEASE
+f4c8d33ad937d366ffd004276482dda00b7a08a2 THUNDERBIRD_18_0b1_RELEASE
+1a178e56fff27a3231cf5baa717dc3923b8857ea THUNDERBIRD_18_0b1_BUILD1
+f4c8d33ad937d366ffd004276482dda00b7a08a2 THUNDERBIRD_18_0b1_BUILD1
+3cf76d429b52ff21d99bb60013ccd79e2099d060 FENNEC_18_0b3_RELEASE
+3cf76d429b52ff21d99bb60013ccd79e2099d060 FENNEC_18_0b3_BUILD1
+07aa4284c3f6c980c6524d48573bfc3a87c3df6c FIREFOX_18_0b3_RELEASE
+07aa4284c3f6c980c6524d48573bfc3a87c3df6c FIREFOX_18_0b3_BUILD1
+db4f5268aded5ae7ffc469cd326d3e0d72f50136 FENNEC_18_0b4_RELEASE
+db4f5268aded5ae7ffc469cd326d3e0d72f50136 FENNEC_18_0b4_BUILD1
+909d572f802d3d9b05a62d74961ecb380a1bd005 FIREFOX_18_0b4_RELEASE
+909d572f802d3d9b05a62d74961ecb380a1bd005 FIREFOX_18_0b4_BUILD1
+db4f5268aded5ae7ffc469cd326d3e0d72f50136 FENNEC_18_0b4_RELEASE
+da73289f3053c8ae327be8d191d2b3b1aae9fd60 FENNEC_18_0b4_RELEASE
+da73289f3053c8ae327be8d191d2b3b1aae9fd60 FENNEC_18_0b4_BUILD2
+77f0b0dd2cd1c4875ab10f5b8e01e05f25c3c9bc FENNEC_18_0b5_RELEASE
+77f0b0dd2cd1c4875ab10f5b8e01e05f25c3c9bc FENNEC_18_0b5_BUILD1
+650211ab03e739f483c82f7eef52c3b30a6d14ce FIREFOX_18_0b5_RELEASE
+650211ab03e739f483c82f7eef52c3b30a6d14ce FIREFOX_18_0b5_BUILD1
+4b8c4d3a7378128525e268b58783552d99241350 FENNEC_18_0b6_RELEASE
+4b8c4d3a7378128525e268b58783552d99241350 FENNEC_18_0b6_BUILD1
+e6af4461e82787170c1675f13dca4cc8101c7bcc FIREFOX_18_0b6_RELEASE
+e6af4461e82787170c1675f13dca4cc8101c7bcc FIREFOX_18_0b6_BUILD1
+62833ebc1056cff4118bf9bb199514013a0e30f6 FENNEC_18_0b7_RELEASE
+62833ebc1056cff4118bf9bb199514013a0e30f6 FENNEC_18_0b7_BUILD1
+2b49049bc52b943917c9588dc8ec9a0b745b0b00 FIREFOX_18_0b7_RELEASE
+2b49049bc52b943917c9588dc8ec9a0b745b0b00 FIREFOX_18_0b7_BUILD1
+26d6449802b82816b3092bc167a4de2f5e00f607 FIREFOX_10_0_12esr_RELEASE
+26d6449802b82816b3092bc167a4de2f5e00f607 FIREFOX_10_0_12esr_BUILD1
+75f174f7782e790061a3b5591c1e16aa2d95ba5b THUNDERBIRD_10_0_12esr_RELEASE
+75f174f7782e790061a3b5591c1e16aa2d95ba5b THUNDERBIRD_10_0_12esr_BUILD1
+e31f8933c4eb99f8132ad78415d0331f7ca11b84 FENNEC_18_0_RELEASE
+e31f8933c4eb99f8132ad78415d0331f7ca11b84 FENNEC_18_0_BUILD1
+0a6fcb94a5f47e23e7c312a60ef8e7348f27dca7 FIREFOX_17_0_2esr_RELEASE
+0a6fcb94a5f47e23e7c312a60ef8e7348f27dca7 FIREFOX_17_0_2esr_BUILD1
+2773be86e9a7355dcd86500b180ff92b01a60d32 THUNDERBIRD_17_0_2_RELEASE
+2773be86e9a7355dcd86500b180ff92b01a60d32 THUNDERBIRD_17_0_2_BUILD1
+1e2b269ba6e5f1a726ac184edd1e0a1fc7b1f2ea FIREFOX_18_0_RELEASE
+1e2b269ba6e5f1a726ac184edd1e0a1fc7b1f2ea FIREFOX_18_0_BUILD1
+9e19361a6421199be13265737ec43294edcd3a1a THUNDERBIRD_17_0_2esr_RELEASE
+9e19361a6421199be13265737ec43294edcd3a1a THUNDERBIRD_17_0_2esr_BUILD1
+1e2b269ba6e5f1a726ac184edd1e0a1fc7b1f2ea FIREFOX_18_0_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_18_0_RELEASE
+1e2b269ba6e5f1a726ac184edd1e0a1fc7b1f2ea FIREFOX_18_0_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_18_0_BUILD1
+0a6fcb94a5f47e23e7c312a60ef8e7348f27dca7 FIREFOX_17_0_2esr_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_17_0_2esr_RELEASE
+0a6fcb94a5f47e23e7c312a60ef8e7348f27dca7 FIREFOX_17_0_2esr_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_17_0_2esr_BUILD1
+2773be86e9a7355dcd86500b180ff92b01a60d32 THUNDERBIRD_17_0_2_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2_RELEASE
+2773be86e9a7355dcd86500b180ff92b01a60d32 THUNDERBIRD_17_0_2_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2_BUILD1
+9e19361a6421199be13265737ec43294edcd3a1a THUNDERBIRD_17_0_2esr_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2esr_RELEASE
+9e19361a6421199be13265737ec43294edcd3a1a THUNDERBIRD_17_0_2esr_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2esr_BUILD1
+e31f8933c4eb99f8132ad78415d0331f7ca11b84 FENNEC_18_0_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FENNEC_18_0_RELEASE
+e31f8933c4eb99f8132ad78415d0331f7ca11b84 FENNEC_18_0_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FENNEC_18_0_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FENNEC_18_0_RELEASE
+51b04f71591bf6fb1d29e32d734a647fbf8062cf FENNEC_18_0_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FENNEC_18_0_BUILD1
+51b04f71591bf6fb1d29e32d734a647fbf8062cf FENNEC_18_0_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_17_0_2esr_RELEASE
+0dc922a544193c6c61fd469c6abe47c42d7337e3 FIREFOX_17_0_2esr_RELEASE
+0dc922a544193c6c61fd469c6abe47c42d7337e3 FIREFOX_17_0_2esr_BUILD2
+75f174f7782e790061a3b5591c1e16aa2d95ba5b THUNDERBIRD_10_0_12esr_RELEASE
+32a35fd8dbc70cd72d530eb6b3347787301be24a THUNDERBIRD_10_0_12esr_RELEASE
+32a35fd8dbc70cd72d530eb6b3347787301be24a THUNDERBIRD_10_0_12esr_BUILD2
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2esr_BUILD1
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2esr_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2esr_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2esr_RELEASE
+51b04f71591bf6fb1d29e32d734a647fbf8062cf FENNEC_18_0_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FENNEC_18_0_RELEASE
+51b04f71591bf6fb1d29e32d734a647fbf8062cf FENNEC_18_0_BUILD1
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FENNEC_18_0_BUILD1
+0dc922a544193c6c61fd469c6abe47c42d7337e3 FIREFOX_17_0_2esr_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_17_0_2esr_RELEASE
+0dc922a544193c6c61fd469c6abe47c42d7337e3 FIREFOX_17_0_2esr_BUILD2
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_17_0_2esr_BUILD2
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_18_0_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_18_0_RELEASE
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 FIREFOX_18_0_BUILD1
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_18_0_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2_BUILD1
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2_BUILD1
+b0d3d70cf7df23f5aceb774be0a75fdd4ff9df86 THUNDERBIRD_17_0_2_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2_RELEASE
+495a022c47a822be6cb1fc11e33cda64f3419b5c THUNDERBIRD_17_0_2_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2_BUILD1
+495a022c47a822be6cb1fc11e33cda64f3419b5c THUNDERBIRD_17_0_2_BUILD1
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_17_0_2esr_RELEASE
+073482bb77ac65b3404180d89d9490a57b074e26 FIREFOX_17_0_2esr_RELEASE
+073482bb77ac65b3404180d89d9490a57b074e26 FIREFOX_17_0_2esr_BUILD3
+495a022c47a822be6cb1fc11e33cda64f3419b5c THUNDERBIRD_17_0_2_RELEASE
+b6d6629f5a4d19d7951eacd8de6f17bb3ad046d5 THUNDERBIRD_17_0_2_RELEASE
+b6d6629f5a4d19d7951eacd8de6f17bb3ad046d5 THUNDERBIRD_17_0_2_BUILD2
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 THUNDERBIRD_17_0_2esr_RELEASE
+1e59e52ebd041599833770547e3f44132f5fc4c6 THUNDERBIRD_17_0_2esr_RELEASE
+1e59e52ebd041599833770547e3f44132f5fc4c6 THUNDERBIRD_17_0_2esr_BUILD2
+1e59e52ebd041599833770547e3f44132f5fc4c6 THUNDERBIRD_17_0_2esr_BUILD2
+48f9061ea0ac3f1a7ebc9c40f692216494632713 THUNDERBIRD_17_0_2esr_BUILD2
+1e59e52ebd041599833770547e3f44132f5fc4c6 THUNDERBIRD_17_0_2esr_RELEASE
+48f9061ea0ac3f1a7ebc9c40f692216494632713 THUNDERBIRD_17_0_2esr_RELEASE
+69b22038fdfda5d4dc20b22b14ba2ebac491ab2a FENNEC_19_0b1_RELEASE
+69b22038fdfda5d4dc20b22b14ba2ebac491ab2a FENNEC_19_0b1_BUILD1
+0b0b14d5d0ac14919b841f2916075051dd0e6443 FIREFOX_19_0b1_RELEASE
+0b0b14d5d0ac14919b841f2916075051dd0e6443 FIREFOX_19_0b1_BUILD1
+69b22038fdfda5d4dc20b22b14ba2ebac491ab2a FENNEC_19_0b1_RELEASE
+62b3a2479c01575210cd9fd85429b9ae4b621fe9 FENNEC_19_0b1_RELEASE
+62b3a2479c01575210cd9fd85429b9ae4b621fe9 FENNEC_19_0b1_BUILD2
+0b0b14d5d0ac14919b841f2916075051dd0e6443 FIREFOX_19_0b1_RELEASE
+efaa1abf0b1eccca0c5fa7ee3f8c597bd138e0c2 FIREFOX_19_0b1_RELEASE
+efaa1abf0b1eccca0c5fa7ee3f8c597bd138e0c2 FIREFOX_19_0b1_BUILD2
+efaa1abf0b1eccca0c5fa7ee3f8c597bd138e0c2 FIREFOX_19_0b1_RELEASE
+578c6f1900544b74a0a8d85d3b12de1f7103b4bd FIREFOX_19_0b1_RELEASE
+578c6f1900544b74a0a8d85d3b12de1f7103b4bd FIREFOX_19_0b1_BUILD3
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_18_0_RELEASE
+3b0a6ab3034b5656ca84b9806e781ae1f1f1bdcf FIREFOX_18_0_RELEASE
+e8b7870b1d963d8f0afd23563ec4be4bd28752c1 FIREFOX_18_0_BUILD1
+01eb080b00152385dc1f1e3c5d728fc11058f501 FIREFOX_18_0_BUILD1
+28e9a2c5921ad052562e24a3bf57c19b92dde7b6 FENNEC_19_0b2_RELEASE
+28e9a2c5921ad052562e24a3bf57c19b92dde7b6 FENNEC_19_0b2_BUILD1
+0e0765526371a1e0430efa461f9ab957bf089c11 FIREFOX_18_0_1_RELEASE
+0e0765526371a1e0430efa461f9ab957bf089c11 FIREFOX_18_0_1_BUILD1
+9f836b86de5a0958b447dd476fad6235da4e6ec3 FIREFOX_19_0b2_RELEASE
+9f836b86de5a0958b447dd476fad6235da4e6ec3 FIREFOX_19_0b2_BUILD1
+be7d34a247026240f580b282c0aa241775183ea5 THUNDERBIRD_19_0b1_RELEASE
+be7d34a247026240f580b282c0aa241775183ea5 THUNDERBIRD_19_0b1_BUILD1
+b013dc896c61a4f3e605882af8d8d7554533bd8a FENNEC_19_0b3_RELEASE
+b013dc896c61a4f3e605882af8d8d7554533bd8a FENNEC_19_0b3_BUILD1
+7da8ea5900ee1c2128ce119498fc79195e44e9b8 FIREFOX_19_0b3_RELEASE
+7da8ea5900ee1c2128ce119498fc79195e44e9b8 FIREFOX_19_0b3_BUILD1
+bb029aaaab0e845a3809eb8b343252d254a9fd2b FENNEC_19_0b4_RELEASE
+bb029aaaab0e845a3809eb8b343252d254a9fd2b FENNEC_19_0b4_BUILD1
+ff9bac3fdaf145595017af088674c24476cdbbd7 FIREFOX_19_0b4_RELEASE
+ff9bac3fdaf145595017af088674c24476cdbbd7 FIREFOX_19_0b4_BUILD1
+0ad4030decde7f203ef62a10f5bdd9956c8b0e19 FIREFOX_18_0_2_RELEASE
+0ad4030decde7f203ef62a10f5bdd9956c8b0e19 FIREFOX_18_0_2_BUILD1
+294b853c0c8a9a10865c97a6d753d1b6eadcb394 FENNEC_19_0b5_RELEASE
+294b853c0c8a9a10865c97a6d753d1b6eadcb394 FENNEC_19_0b5_BUILD1
+bf8e04695b2e5b38f4589cba5d7a082fa58ce4f1 FIREFOX_19_0b5_RELEASE
+bf8e04695b2e5b38f4589cba5d7a082fa58ce4f1 FIREFOX_19_0b5_BUILD1
+6e3932466a37d1791d159e140d0dc374ceb2e1d1 FENNEC_18_0_2_RELEASE
+6e3932466a37d1791d159e140d0dc374ceb2e1d1 FENNEC_18_0_2_BUILD1
+294b853c0c8a9a10865c97a6d753d1b6eadcb394 FENNEC_19_0b5_RELEASE
+6609d6a86816a03d3c255d27c8b26461b93100b9 FENNEC_19_0b5_RELEASE
+6609d6a86816a03d3c255d27c8b26461b93100b9 FENNEC_19_0b5_BUILD2
+6609d6a86816a03d3c255d27c8b26461b93100b9 FENNEC_19_0b5_BUILD2
+9be3717f4e356d91e9b659f71ddcb0c561ba39bc FENNEC_19_0b5_BUILD2
+6609d6a86816a03d3c255d27c8b26461b93100b9 FENNEC_19_0b5_RELEASE
+9be3717f4e356d91e9b659f71ddcb0c561ba39bc FENNEC_19_0b5_RELEASE
+6e3932466a37d1791d159e140d0dc374ceb2e1d1 FENNEC_18_0_2_BUILD1
+f6e4a95b610f6403bd00a0b45f688ec4864cada9 FENNEC_18_0_2_BUILD1
+6e3932466a37d1791d159e140d0dc374ceb2e1d1 FENNEC_18_0_2_RELEASE
+f6e4a95b610f6403bd00a0b45f688ec4864cada9 FENNEC_18_0_2_RELEASE
+9034409faa93a1353a9e3dec0b3b453f660ad9c4 FENNEC_19_0b6_RELEASE
+9034409faa93a1353a9e3dec0b3b453f660ad9c4 FENNEC_19_0b6_BUILD1
+7a2223ecf3f154b68349cebe38c3f7848940c2ab FIREFOX_19_0b6_RELEASE
+7a2223ecf3f154b68349cebe38c3f7848940c2ab FIREFOX_19_0b6_BUILD1
+7972acee254fcd09b81bfb97209b5389f01a8a34 FENNEC_19_0_RELEASE
+7972acee254fcd09b81bfb97209b5389f01a8a34 FENNEC_19_0_BUILD1
+28d6f4397ffe0e47134465f6519070101df1535a FIREFOX_17_0_3esr_RELEASE
+28d6f4397ffe0e47134465f6519070101df1535a FIREFOX_17_0_3esr_BUILD1
+dfc9c596768b7eece71471b80628e3027788ad4e FIREFOX_19_0_RELEASE
+dfc9c596768b7eece71471b80628e3027788ad4e FIREFOX_19_0_BUILD1
+9399f2f0e6d39ce05e700efe0bb65e8b4beb2c64 THUNDERBIRD_17_0_3_RELEASE
+9399f2f0e6d39ce05e700efe0bb65e8b4beb2c64 THUNDERBIRD_17_0_3_BUILD1
+da4f9e2a2236874560f6858f81d6cbd9e8dbd0e1 THUNDERBIRD_17_0_3esr_RELEASE
+da4f9e2a2236874560f6858f81d6cbd9e8dbd0e1 THUNDERBIRD_17_0_3esr_BUILD1
+9399f2f0e6d39ce05e700efe0bb65e8b4beb2c64 THUNDERBIRD_17_0_3_RELEASE
+1c2417e2a6c3132d0907035558413d4330df6f4c THUNDERBIRD_17_0_3_RELEASE
+9399f2f0e6d39ce05e700efe0bb65e8b4beb2c64 THUNDERBIRD_17_0_3_BUILD1
+1c2417e2a6c3132d0907035558413d4330df6f4c THUNDERBIRD_17_0_3_BUILD1
+1c2417e2a6c3132d0907035558413d4330df6f4c THUNDERBIRD_17_0_3_RELEASE
+b80273c3db3e4dc5bd63f0d268a4dc48ba90f1cd THUNDERBIRD_17_0_3_RELEASE
+1c2417e2a6c3132d0907035558413d4330df6f4c THUNDERBIRD_17_0_3_BUILD1
+b80273c3db3e4dc5bd63f0d268a4dc48ba90f1cd THUNDERBIRD_17_0_3_BUILD1
+da4f9e2a2236874560f6858f81d6cbd9e8dbd0e1 THUNDERBIRD_17_0_3esr_RELEASE
+809be21aaa12ef922bde9f6f6e956ce0f8d28648 THUNDERBIRD_17_0_3esr_RELEASE
+da4f9e2a2236874560f6858f81d6cbd9e8dbd0e1 THUNDERBIRD_17_0_3esr_BUILD1
+809be21aaa12ef922bde9f6f6e956ce0f8d28648 THUNDERBIRD_17_0_3esr_BUILD1
+3ee0b12dce376a5cb40ccef38017dc8ecd4f6a16 FENNEC_20_0b1_RELEASE
+3ee0b12dce376a5cb40ccef38017dc8ecd4f6a16 FENNEC_20_0b1_BUILD1
+0147ccb3cb5b54c8404d3d12ca2fc053f9275a8d FIREFOX_20_0b1_RELEASE
+0147ccb3cb5b54c8404d3d12ca2fc053f9275a8d FIREFOX_20_0b1_BUILD1
+0147ccb3cb5b54c8404d3d12ca2fc053f9275a8d FIREFOX_20_0b1_RELEASE
+99acc7eec4f115c0bd2af11fcf39dea150bfe593 FIREFOX_20_0b1_RELEASE
+0147ccb3cb5b54c8404d3d12ca2fc053f9275a8d FIREFOX_20_0b1_BUILD1
+99acc7eec4f115c0bd2af11fcf39dea150bfe593 FIREFOX_20_0b1_BUILD1
+99acc7eec4f115c0bd2af11fcf39dea150bfe593 FIREFOX_20_0b1_RELEASE
+9102b3b1d26be1d02e45ebe6fe4d401dcb8a72ec FIREFOX_20_0b1_RELEASE
+9102b3b1d26be1d02e45ebe6fe4d401dcb8a72ec FIREFOX_20_0b1_BUILD2
+3ee0b12dce376a5cb40ccef38017dc8ecd4f6a16 FENNEC_20_0b1_RELEASE
+02cd401b49c012ccb623b1ff9f9c969034d3f055 FENNEC_20_0b1_RELEASE
+02cd401b49c012ccb623b1ff9f9c969034d3f055 FENNEC_20_0b1_BUILD2
+02cd401b49c012ccb623b1ff9f9c969034d3f055 FENNEC_20_0b1_RELEASE
+70cd4e0d6e04712da6a52f70aa4d05b92286f8cc FENNEC_20_0b1_RELEASE
+70cd4e0d6e04712da6a52f70aa4d05b92286f8cc FENNEC_20_0b1_BUILD3
+0541ddb18dc3d9dd24a4cc9002ff32b44cca5b81 FIREFOX_19_0_1_RELEASE
+0541ddb18dc3d9dd24a4cc9002ff32b44cca5b81 FIREFOX_19_0_1_BUILD1
+9b12096e7580d7c2b3eb5f09b4a7cdf83bde448f FENNEC_20_0b2_RELEASE
+9b12096e7580d7c2b3eb5f09b4a7cdf83bde448f FENNEC_20_0b2_BUILD1
+a3296a8e529cb642c27c126497e376b6ead56b4d FIREFOX_20_0b2_RELEASE
+a3296a8e529cb642c27c126497e376b6ead56b4d FIREFOX_20_0b2_BUILD1
+9b12096e7580d7c2b3eb5f09b4a7cdf83bde448f FENNEC_20_0b2_RELEASE
+0646ba1b7c1c020ecac534f2f9429e107502f0b3 FENNEC_20_0b2_RELEASE
+0646ba1b7c1c020ecac534f2f9429e107502f0b3 FENNEC_20_0b2_BUILD2
+13147f37d0b424fdd36a1e09f80850180767d20a THUNDERBIRD_20_0b1_RELEASE
+13147f37d0b424fdd36a1e09f80850180767d20a THUNDERBIRD_20_0b1_BUILD1
+4186784255ff5032c848d6f0a41dfdabe31cfe63 FENNEC_20_0b3_RELEASE
+4186784255ff5032c848d6f0a41dfdabe31cfe63 FENNEC_20_0b3_BUILD1
+e4002b6c5ebe5e875c857e0a52a8f0f39926555b FIREFOX_20_0b3_RELEASE
+e4002b6c5ebe5e875c857e0a52a8f0f39926555b FIREFOX_20_0b3_BUILD1
+9b9720165108a0ce26461a15662920ff9776827e FENNEC_19_0_1_RELEASE
+9b9720165108a0ce26461a15662920ff9776827e FENNEC_19_0_1_BUILD1
+2408c182c5e57d565e8ce907c6b44fb3a2edd7b4 FENNEC_19_0_2_RELEASE
+2408c182c5e57d565e8ce907c6b44fb3a2edd7b4 FENNEC_19_0_2_BUILD1
+e4f1f12aaade56a1045ced7ab67d066aba723525 FIREFOX_19_0_2_RELEASE
+e4f1f12aaade56a1045ced7ab67d066aba723525 FIREFOX_19_0_2_BUILD1
+3b5e89f066196f215c839f31c2bf3d1064a7c665 FENNEC_20_0b4_RELEASE
+3b5e89f066196f215c839f31c2bf3d1064a7c665 FENNEC_20_0b4_BUILD1
+bd6ede919c9c84c0b3c623899940791eaa376257 FIREFOX_17_0_4esr_RELEASE
+bd6ede919c9c84c0b3c623899940791eaa376257 FIREFOX_17_0_4esr_BUILD1
+0f7b8ea667100f1927a2986046eac0929e610053 FIREFOX_20_0b4_RELEASE
+0f7b8ea667100f1927a2986046eac0929e610053 FIREFOX_20_0b4_BUILD1
+bd6ede919c9c84c0b3c623899940791eaa376257 FIREFOX_17_0_4esr_BUILD1
+f998a88d0d7cd76e05235ca9ec55cfceb4eec69d FIREFOX_17_0_4esr_BUILD1
+bd6ede919c9c84c0b3c623899940791eaa376257 FIREFOX_17_0_4esr_RELEASE
+8de26c79291a5ca0b2e71384dc622dd77c3db3e0 FIREFOX_17_0_4esr_RELEASE
+32b370ca7cd13b366dfe4513e771373bd1c55b13 THUNDERBIRD_17_0_4_RELEASE
+32b370ca7cd13b366dfe4513e771373bd1c55b13 THUNDERBIRD_17_0_4_BUILD1
+e13962e65d2d37915523c4f6f9739f9fdf5b1384 THUNDERBIRD_17_0_4esr_RELEASE
+e13962e65d2d37915523c4f6f9739f9fdf5b1384 THUNDERBIRD_17_0_4esr_BUILD1
+13147f37d0b424fdd36a1e09f80850180767d20a THUNDERBIRD_20_0b1_RELEASE
+0a5b209878f928a3679d209ff71902ee9b1c5097 THUNDERBIRD_20_0b1_RELEASE
+0a5b209878f928a3679d209ff71902ee9b1c5097 THUNDERBIRD_20_0b1_BUILD2
+e13962e65d2d37915523c4f6f9739f9fdf5b1384 THUNDERBIRD_17_0_4esr_RELEASE
+226fc229fb93612b1c2bc6b23569f7ecc63e380e THUNDERBIRD_17_0_4esr_RELEASE
+e13962e65d2d37915523c4f6f9739f9fdf5b1384 THUNDERBIRD_17_0_4esr_BUILD1
+226fc229fb93612b1c2bc6b23569f7ecc63e380e THUNDERBIRD_17_0_4esr_BUILD1
+5956b9e646eb59cf50e77b76211aeaf70ca0cb2f FENNEC_20_0b5_RELEASE
+5956b9e646eb59cf50e77b76211aeaf70ca0cb2f FENNEC_20_0b5_BUILD1
+9251e40937b8e233f65796c7e8ee77b298e6096f FIREFOX_20_0b5_RELEASE
+9251e40937b8e233f65796c7e8ee77b298e6096f FIREFOX_20_0b5_BUILD1
+7aece4e043c477a112ce268657f726694510665a FENNEC_20_0b6_RELEASE
+7aece4e043c477a112ce268657f726694510665a FENNEC_20_0b6_BUILD1
+0b075b8e1c6abb9762f897084084fb35c99a79b9 FIREFOX_20_0b6_RELEASE
+0b075b8e1c6abb9762f897084084fb35c99a79b9 FIREFOX_20_0b6_BUILD1
+51b7317967c6ba8b205f22cb283f74b159189413 FENNEC_20_0b7_RELEASE
+51b7317967c6ba8b205f22cb283f74b159189413 FENNEC_20_0b7_BUILD1
+856082b2d517df6d98b49b439fcd3eb5bbda47b9 FIREFOX_20_0b7_RELEASE
+856082b2d517df6d98b49b439fcd3eb5bbda47b9 FIREFOX_20_0b7_BUILD1
+270210b083414146700ac6d90380c5633f61779a FENNEC_20_0_RELEASE
+270210b083414146700ac6d90380c5633f61779a FENNEC_20_0_BUILD1
+b5ac59c7786ff9553b4734c096876bce37372a47 FIREFOX_20_0_RELEASE
+b5ac59c7786ff9553b4734c096876bce37372a47 FIREFOX_20_0_BUILD1
+e7bb069448cfcebaabd2e01ece49b9b12500011e FIREFOX_17_0_5esr_RELEASE
+e7bb069448cfcebaabd2e01ece49b9b12500011e FIREFOX_17_0_5esr_BUILD1
+c227c2933cdf53419c8f50ee8627a2f28e8e6aa6 THUNDERBIRD_17_0_5_RELEASE
+c227c2933cdf53419c8f50ee8627a2f28e8e6aa6 THUNDERBIRD_17_0_5_BUILD1
+419c05f2bddb07a87c0048952aae7937feb9d5f6 THUNDERBIRD_17_0_5esr_RELEASE
+419c05f2bddb07a87c0048952aae7937feb9d5f6 THUNDERBIRD_17_0_5esr_BUILD1
+c227c2933cdf53419c8f50ee8627a2f28e8e6aa6 THUNDERBIRD_17_0_5_RELEASE
+92af4d1d4f99f64f6ac31cfa75eeb0fc83a542a5 THUNDERBIRD_17_0_5_RELEASE
+c227c2933cdf53419c8f50ee8627a2f28e8e6aa6 THUNDERBIRD_17_0_5_BUILD1
+92af4d1d4f99f64f6ac31cfa75eeb0fc83a542a5 THUNDERBIRD_17_0_5_BUILD1
--- a/Makefile.master
+++ b/Makefile.master
@@ -1,11 +1,11 @@
 PWD=$(shell pwd)
 BUILDBOT=$(PWD)/bin/buildbot
-HG=/tools/python/bin/hg
+HG=hg
 PRODUCTION_MASTERS=tools/buildfarm/maintenance/production-masters.json
 export PYTHONDONTWRITEBYTECODE=1
 export PYTHONPATH=""
 
 start:
 	cd master && $(BUILDBOT) start $$PWD
 stop:
 	cd master && $(BUILDBOT) stop $$PWD
--- a/Makefile.setup
+++ b/Makefile.setup
@@ -3,41 +3,70 @@ VIRTUALENV ?= virtualenv
 PYTHON ?= /tools/python/bin/python
 PIP_PACKAGES_FILE ?= master-pip.txt
 HG ?= hg
 HG_HOST = http://hg.mozilla.org
 HG_DIR = build
 MASTER_NAME = $(error MASTER_NAME must be defined (see setup-master.py -l for a list))
 DATABASE = tm-b01-master01.mozilla.org/buildbot
 MYSQL_CONFIG = $(HOME)/.$(MASTER_NAME)_update_from_files.conf
-CRONTAB = /etc/cron.d/$(MASTER_NAME)
 VIRTUALENV_PYTHON = $(BASEDIR)/bin/python
 PIP = $(BASEDIR)/bin/pip
 BUILDBOT = $(BASEDIR)/bin/buildbot
 USER = cltbld
 HOME = /home/$(USER)
 BUILDBOT_BRANCH = production-0.8
 BUILDBOTCUSTOM_BRANCH = production-0.8
 BUILDBOTCONFIGS_BRANCH = production
+TOOLS_BRANCH = default
+TOOLS_REPO ?= $(HG_HOST)/$(HG_DIR)/tools
 INSTALL_BUILDBOT_SLAVE=
 
+# staging master setup
+ifdef USE_DEV_MASTER
+MASTERS_JSON = dev-master_config.json
+HTTP_PORT = $(error HTTP_PORT must be defined)
+PB_PORT = $(error PB_PORT must be defined)
+SSH_PORT = $(error SSH_PORT must be defined)
+ROLE = $(error ROLE must be defined)
+
+GENERATE_MASTERS_JSON_CMD = \
+    sed -e 's,@BASEDIR@,$(BASEDIR),g' \
+        -e 's,@HTTP_PORT@,$(HTTP_PORT),g' \
+        -e 's,@PB_PORT@,$(PB_PORT),g' \
+        -e 's,@SSH_PORT@,$(SSH_PORT),g' \
+        -e 's,@MASTER_NAME@,$(MASTER_NAME),g' \
+        -e 's,@ROLE@,$(ROLE),g' \
+        -e 's,@ROLE@,$(ROLE),g' \
+        -e 's,@BUILDBOTCUSTOM_BRANCH@,$(BUILDBOTCUSTOM_BRANCH),g' \
+        -e 's,@BUILDBOTCONFIGS_BRANCH@,$(BUILDBOTCONFIGS_BRANCH),g' \
+        -e 's,@TOOLS_BRANCH@,$(TOOLS_BRANCH),g' \
+        -e 's,@BUILDBOT_BRANCH@,$(BUILDBOT_BRANCH),g' \
+        $(MASTERS_JSON).in > $(MASTERS_JSON)
+endif
+
+ifdef UNIVERSAL
+UNIVERSAL_OPT=-u
+else
+UNIVERSAL_OPT=
+endif
+
 ifdef MASTERS_JSON
 SETUP_MASTER=setup-master.py -j $(MASTERS_JSON)
 else
 SETUP_MASTER=setup-master.py -8
 endif
 
 all: virtualenv deps install-buildbot master master-makefile other-files done
 
 done:
 	@echo
 	@echo
 	@echo You probably want to update at least the following files to contain accurate passwords/descriptions:
 	@echo BuildSlaves.py, passwords.py, $(MYSQL_CONFIG)
-	@echo You should also run the "cron" target as root, with the same variables set.
 
 virtualenv:
 	$(VIRTUALENV) --distribute --no-site-packages -p $(PYTHON) $(BASEDIR)
 
 deps:
 	$(PIP) install $(PIP_FLAGS) -r $(PIP_PACKAGES_FILE)
 	
 # HACK ALERT: This only works when there's only one python version in "lib".
@@ -46,32 +75,30 @@ install-buildbot: SITE_PACKAGES = $(BASE
 install-buildbot:
 	test -d $(BASEDIR)/buildbot || $(HG) clone -b $(BUILDBOT_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbot $(BASEDIR)/buildbot
 	(cd $(BASEDIR)/buildbot/master; $(VIRTUALENV_PYTHON) setup.py develop install)
 ifdef INSTALL_BUILDBOT_SLAVE
 	(cd $(BASEDIR)/buildbot/slave; $(VIRTUALENV_PYTHON) setup.py develop install)
 endif
 	test -d $(BASEDIR)/buildbotcustom || $(HG) clone -b $(BUILDBOTCUSTOM_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbotcustom $(BASEDIR)/buildbotcustom
 	test -d $(BASEDIR)/buildbot-configs || $(HG) clone -b $(BUILDBOTCONFIGS_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbot-configs $(BASEDIR)/buildbot-configs
-	test -d $(BASEDIR)/tools || $(HG) clone $(HG_HOST)/$(HG_DIR)/tools $(BASEDIR)/tools
+	test -d $(BASEDIR)/tools || $(HG) clone -b $(TOOLS_BRANCH) $(TOOLS_REPO) $(BASEDIR)/tools
 	# Get buildbotcustom and the build/tools library into PYTHONPATH
 	ln -sf $(BASEDIR)/buildbotcustom $(SITE_PACKAGES)/buildbotcustom
 	echo "$(BASEDIR)/tools/lib/python" > $(SITE_PACKAGES)/build-tools-lib.pth
 
 master:
-	(cd $(BASEDIR)/buildbot-configs; $(VIRTUALENV_PYTHON) $(SETUP_MASTER) -b $(BUILDBOT) $(BASEDIR)/master $(MASTER_NAME))
+ifdef GENERATE_MASTERS_JSON_CMD
+	cd $(BASEDIR)/buildbot-configs && $(GENERATE_MASTERS_JSON_CMD)
+endif
+	cd $(BASEDIR)/buildbot-configs && \
+	    $(VIRTUALENV_PYTHON) $(SETUP_MASTER) $(UNIVERSAL_OPT) -b $(BUILDBOT) $(BASEDIR)/master $(MASTER_NAME)
 
 master-makefile:
-	cp $(BASEDIR)/buildbot-configs/Makefile.master $(BASEDIR)/Makefile
+	ln -sf $(BASEDIR)/buildbot-configs/Makefile.master $(BASEDIR)/Makefile
 
 other-files:
 	echo "[DEFAULT]" > $(MYSQL_CONFIG)
 	echo "database = mysql://buildbot:password@$(DATABASE)" >> $(MYSQL_CONFIG)
 	echo "master = http://this-master:port" >> $(MYSQL_CONFIG)
 	echo "name = $(MASTER_NAME)" >> $(MYSQL_CONFIG)
 
-cron:
-	echo "MAILTO=release@mozilla.com" > $(CRONTAB)
-	echo "@hourly cltbld (source $(HOME)/.bash_profile && $(VIRTUALENV_PYTHON) $(BASEDIR)/tools/buildfarm/maintenance/watch_twistd_log.py -t .$(MASTER_NAME)-last-time.txt -n $(MASTER_NAME) -f cltbld@`hostname --fqdn` -e release@mozilla.com $(BASEDIR)/master)" >> $(CRONTAB)
-	echo "15 * * * * cltbld lockfile -60 -r 3 $(HOME)/lockfile.$(MASTER_NAME)_cleanup 2>/dev/null && (source $(HOME)/.bash_profile && nice -n 19 $(VIRTUALENV_PYTHON) $(BASEDIR)/tools/buildfarm/maintenance/master_cleanup.py -t4 $(BASEDIR)/master ; rm -f $(HOME)/lockfile.$(MASTER_NAME)_cleanup) >> cleanup.log 2>&1" >> $(CRONTAB)
-	echo "*/2 * * * *	cltbld lockfile -20 -r 3 $(HOME)/lockfile.bbdb 2>/dev/null && (source $(HOME)/.bash_profile && cd $(BASEDIR)/master; time nice $(VIRTUALENV_PYTHON) $(BASEDIR)/buildbotcustom/bin/update_from_files.py -c $(MYSQL_CONFIG) . ; rm -f $(HOME)/lockfile.bbdb ) >> update.log 2>&1" >> $(CRONTAB)
-	echo "@hourly cltbld find $(HOME) -name lockfile.bbdb -mmin +360 -delete" >> $(CRONTAB)
-	chmod 644 $(CRONTAB)
+.PHONY: all done virtualenv deps install-buildbot master master-makefile other-files
--- a/calendar/config.py
+++ b/calendar/config.py
@@ -10,93 +10,229 @@ STAGE_USERNAME = 'calbld'
 STAGE_SERVER = 'stage.mozilla.org'
 STAGE_GROUP = 'calendar'
 STAGE_SSH_KEY = 'calbld_dsa'
 AUS2_USER = 'calbld'
 AUS2_HOST = 'aus-staging.sj.mozillamessaging.com'
 DOWNLOAD_BASE_URL = 'http://ftp.mozilla.org/pub/mozilla.org/calendar/'
 PRODUCT = 'calendar'
 MOZ_APP_NAME = 'calendar'
-SYMBOL_SERVER_HOST = 'dm-symbolpush01.mozilla.org'
+SYMBOL_SERVER_HOST = 'symbolpush.mozilla.org'
 SYMBOL_SERVER_USER = 'calbld'
 SYMBOL_SERVER_PATH = '/mnt/netapp/breakpad/symbols_sbrd/'
 SYMBOL_SERVER_POST_UPLOAD_CMD = '/usr/local/bin/post-symbol-upload.py'
+LIGHTNING_UPDATE_LOCATION = 'https://calendar.mozilla.org/update.php'
 
 ORGANIZATION = 'community'
 
 BUILDERS = {
     'linux': {
         'community': [ 'momo-vm-cal-linux-01' ],
     },
     'linux64': {
         'momo': ['momo-vm-cal-linux64-01'],
     },
     'macosx': {
-#        '10.5': {
-#            'community': [ 'cb-xserve03' ],
-#        },
         '10.6': {
-            'momo':      [ 'mini64-cal-01' ],
+            'momo':      [ 'tb2-darwin10-slave64' ],
+            'sea':       [ 'sea-loaner-osx' ],
+        },
+        '10.7': {
+            'community':      [ 'cal-mini-osx64-1' ],
         }
     },
     'win32': {
-        'community': [ 'cb-sb-win32-tbox' ],
+        'community': [ 'cal-vm-win32-tbox' ],
+        'community-new': ['cal-vm-win32-1' ],
     },
 }
 
 DEFAULTS = {
     'factory':                'build',
     'hgurl':                  HGURL,
     'branch_name':            'comm-central',
     'stage_base_path':        '/home/ftp/pub/mozilla.org/calendar',
     'mozilla_central_branch': 'releases/mozilla-1.9.1',
     'l10n_repo':              'releases/l10n/mozilla-aurora',
     'add_poll_branches':      [ ],
     'period':                 60 * 60 * 8,
     'nightly_hour':           [3],
     'nightly_minute':         [0],
     'irc':                    True,
-    'clobber_url':            "http://build.mozillamessaging.com/clobberer/",
+    'clobber_url':            "https://calendar-master.mozillalabs.com/clobberer/",
     'builder_type':           "build",
     'tinderbox_tree':         "ThunderbirdTest",
-    'codesighs':              False,
     'mozmill':                False,
     'product_name':           'sunbird',
     'brand_name':             'Sunbird',
     'app_name':               'calendar',
     'build_space':            8,
     'l10n_nightly_updates':   False,
  
     'stage_username':         STAGE_USERNAME,
     'stage_server':           STAGE_SERVER,
     'stage_group':            STAGE_GROUP,
     'stage_ssh_key':          STAGE_SSH_KEY,
     
     # Unit Test
     'client_py_args':       ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time'],
 
-    'clobber_url':  "http://build.mozillamessaging.com/clobberer/",
     'build_tools_repo': "build/tools",
     'hg_rev_shortnames': {
       'mozilla-central':        'moz',
       'comm-central':           'cc',
+      'comm-aurora':            'ca',
+      'comm-beta':              'cb',
+      'comm-release':           'cr',
       'dom-inspector':          'domi',
       'releases/mozilla-1.9.1': 'moz191',
       'releases/mozilla-1.9.2': 'moz192',
       'releases/mozilla-aurora':   'mozaurora',
       'releases/comm-1.9.1':    'cc191',
     }
 }
 
 # All branches that are to be built MUST be listed here.
 BRANCHES = {
     'comm-release': {},
     'comm-beta': {},
     'comm-aurora': {},
-    'comm-central': {},
+    'comm-esr17': {}
+#    'comm-central': {},
+}
+
+######## lightning-esr17
+# All platforms being built for this branch MUST be listed here.
+BRANCHES['comm-esr17']['platforms'] = {
+    'linux': {},
+    'linux64': {},
+    'win32': {},
+    'macosx64': {},
+}
+
+BRANCHES['comm-esr17']['mozilla_central_branch'] = 'releases/mozilla-esr17'
+BRANCHES['comm-esr17']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
+BRANCHES['comm-esr17']['branch_name'] = 'comm-esr17'
+BRANCHES['comm-esr17']['hg_branch'] = 'releases/comm-esr17'
+BRANCHES['comm-esr17']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman'] + ['--mozilla-repo=http://hg.mozilla.org/releases/mozilla-esr17']
+BRANCHES['comm-esr17']['mozconfig'] = 'mozconfig-lightning'
+BRANCHES['comm-esr17']['period'] = 60 * 60 * 10
+BRANCHES['comm-esr17']['nightly_hour'] = [0]
+BRANCHES['comm-esr17']['nightly'] = False
+# Lightning doesn't need to package Thunderbird
+BRANCHES['comm-esr17']['package'] = False
+BRANCHES['comm-esr17']['upload_stage'] = True
+BRANCHES['comm-esr17']['upload_complete_mar'] = False
+#Might be better off per-platform instead of per-branch here.
+BRANCHES['comm-esr17']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
+BRANCHES['comm-esr17']['stage_username'] = 'calbld'
+BRANCHES['comm-esr17']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
+BRANCHES['comm-esr17']['stage_group'] = 'calendar'
+BRANCHES['comm-esr17']['stage_ssh_key'] = 'calbld_dsa'
+BRANCHES['comm-esr17']['l10n'] = False
+BRANCHES['comm-esr17']['l10n_tree'] = 'calendar10x'
+BRANCHES['comm-esr17']['l10n_repo'] = 'releases/l10n/mozilla-esr17'
+BRANCHES['comm-esr17']['irc_nick'] = 'calbuild'
+BRANCHES['comm-esr17']['irc_channels'] = [ 'maildev', 'calendar' ]
+BRANCHES['comm-esr17']['extensions'] = {
+    'lightning': {
+        'subdir': "calendar/lightning",
+        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
+        'l10n': True
+    }
+}
+
+BRANCHES['comm-esr17']['platforms']['linux']['base_name'] = 'Linux comm-esr17 lightning'
+BRANCHES['comm-esr17']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-esr17 lightning'
+BRANCHES['comm-esr17']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-esr17 lightning'
+BRANCHES['comm-esr17']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-esr17 lightning'
+BRANCHES['comm-esr17']['platforms']['linux']['profiled_build'] = False
+BRANCHES['comm-esr17']['platforms']['linux64']['profiled_build'] = False
+BRANCHES['comm-esr17']['platforms']['win32']['profiled_build'] = False
+BRANCHES['comm-esr17']['platforms']['macosx64']['profiled_build'] = False
+BRANCHES['comm-esr17']['platforms']['linux']['milestone'] = "comm-esr17/linux-xpi"
+BRANCHES['comm-esr17']['platforms']['linux64']['milestone'] = "comm-esr17/linux64-xpi"
+BRANCHES['comm-esr17']['platforms']['win32']['milestone'] = "comm-esr17/win32-xpi"
+BRANCHES['comm-esr17']['platforms']['macosx64']['milestone'] = "comm-esr17/macosx-xpi"
+BRANCHES['comm-esr17']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
+# If True, a complete update snippet for this branch will be generated and
+# uploaded to. Any platforms with 'debug' in them will not have snippets
+# generated.
+BRANCHES['comm-esr17']['create_snippet'] = False
+BRANCHES['comm-esr17']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
+BRANCHES['comm-esr17']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
+BRANCHES['comm-esr17']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
+BRANCHES['comm-esr17']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
+# If True, 'make buildsymbols' and 'make uploadsymbols' will be run
+# SYMBOL_SERVER_* variables are setup in the environment section below
+BRANCHES['comm-esr17']['platforms']['linux']['upload_symbols'] = True
+BRANCHES['comm-esr17']['platforms']['linux64']['upload_symbols'] = True
+BRANCHES['comm-esr17']['platforms']['win32']['upload_symbols'] = True
+BRANCHES['comm-esr17']['platforms']['macosx64']['upload_symbols'] = True
+BRANCHES['comm-esr17']['tinderbox_tree'] = 'Calendar-Beta'
+BRANCHES['comm-esr17']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
+BRANCHES['comm-esr17']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
+BRANCHES['comm-esr17']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
+BRANCHES['comm-esr17']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
+
+# This is used in a bunch of places where something needs to be run from
+# the objdir. This is necessary because of universal builds on Mac
+# creating subdirectories inside of the objdir.
+BRANCHES['comm-esr17']['platforms']['linux']['platform_objdir'] = OBJDIR
+BRANCHES['comm-esr17']['platforms']['linux64']['platform_objdir'] = OBJDIR
+BRANCHES['comm-esr17']['platforms']['win32']['platform_objdir'] = OBJDIR
+BRANCHES['comm-esr17']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
+BRANCHES['comm-esr17']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
+    'MOZ_OBJDIR': OBJDIR,
+    'TINDERBOX_OUTPUT': '1',
+    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
+}
+BRANCHES['comm-esr17']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
+    'MOZ_OBJDIR': OBJDIR,
+    'TINDERBOX_OUTPUT': '1',
+    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
+}
+BRANCHES['comm-esr17']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
+    'MOZ_OBJDIR': OBJDIR,
+    'TINDERBOX_OUTPUT': '1',
+    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltlbld/.ssh/calbld_dsa',
+}
+BRANCHES['comm-esr17']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
+    'MOZ_OBJDIR': OBJDIR,
+    'TINDERBOX_OUTPUT': '1',
+    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+    'DISABLE_LIGHTNING_INSTALL': '1',
+    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
+
+    # See bug 758694
+    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
 }
 
 ######## lightning-release
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-release']['platforms'] = {
     'linux': {},
     'linux64': {},
     'win32': {},
@@ -117,17 +253,16 @@ BRANCHES['comm-release']['package'] = Fa
 BRANCHES['comm-release']['upload_stage'] = True
 BRANCHES['comm-release']['upload_complete_mar'] = False
 #Might be better off per-platform instead of per-branch here.
 BRANCHES['comm-release']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
 BRANCHES['comm-release']['stage_username'] = 'calbld'
 BRANCHES['comm-release']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
 BRANCHES['comm-release']['stage_group'] = 'calendar'
 BRANCHES['comm-release']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-release']['codesighs'] = False
 BRANCHES['comm-release']['l10n'] = False
 BRANCHES['comm-release']['l10n_tree'] = 'calendar10x'
 BRANCHES['comm-release']['l10n_repo'] = 'releases/l10n/mozilla-release'
 BRANCHES['comm-release']['irc_nick'] = 'calbuild'
 BRANCHES['comm-release']['irc_channels'] = [ 'maildev', 'calendar' ]
 BRANCHES['comm-release']['extensions'] = {
     'lightning': {
         'subdir': "calendar/lightning",
@@ -161,18 +296,18 @@ BRANCHES['comm-release']['platforms']['m
 # SYMBOL_SERVER_* variables are setup in the environment section below
 BRANCHES['comm-release']['platforms']['linux']['upload_symbols'] = True
 BRANCHES['comm-release']['platforms']['linux64']['upload_symbols'] = True
 BRANCHES['comm-release']['platforms']['win32']['upload_symbols'] = True
 BRANCHES['comm-release']['platforms']['macosx64']['upload_symbols'] = True
 BRANCHES['comm-release']['tinderbox_tree'] = 'Calendar-Release'
 BRANCHES['comm-release']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
 BRANCHES['comm-release']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-release']['platforms']['win32']['slaves'] = BUILDERS['win32']['community']
-BRANCHES['comm-release']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.6']['momo']
+BRANCHES['comm-release']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
+BRANCHES['comm-release']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
 
 # This is used in a bunch of places where something needs to be run from
 # the objdir. This is necessary because of universal builds on Mac
 # creating subdirectories inside of the objdir.
 BRANCHES['comm-release']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['comm-release']['platforms']['linux64']['platform_objdir'] = OBJDIR
 BRANCHES['comm-release']['platforms']['win32']['platform_objdir'] = OBJDIR
 BRANCHES['comm-release']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
@@ -180,46 +315,55 @@ BRANCHES['comm-release']['platforms']['l
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
 }
 BRANCHES['comm-release']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
 }
 BRANCHES['comm-release']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/calbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
 }
 BRANCHES['comm-release']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'DISABLE_LIGHTNING_INSTALL': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/cltbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
+
+    # See bug 758694
+    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
 }
 
 ######## lightning-beta
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-beta']['platforms'] = {
     'linux': {},
     'linux64': {},
     'win32': {},
@@ -240,17 +384,16 @@ BRANCHES['comm-beta']['package'] = False
 BRANCHES['comm-beta']['upload_stage'] = True
 BRANCHES['comm-beta']['upload_complete_mar'] = False
 #Might be better off per-platform instead of per-branch here.
 BRANCHES['comm-beta']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
 BRANCHES['comm-beta']['stage_username'] = 'calbld'
 BRANCHES['comm-beta']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
 BRANCHES['comm-beta']['stage_group'] = 'calendar'
 BRANCHES['comm-beta']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-beta']['codesighs'] = False
 BRANCHES['comm-beta']['l10n'] = False
 BRANCHES['comm-beta']['l10n_tree'] = 'calendar10x'
 BRANCHES['comm-beta']['l10n_repo'] = 'releases/l10n/mozilla-beta'
 BRANCHES['comm-beta']['irc_nick'] = 'calbuild'
 BRANCHES['comm-beta']['irc_channels'] = [ 'maildev', 'calendar' ]
 BRANCHES['comm-beta']['extensions'] = {
     'lightning': {
         'subdir': "calendar/lightning",
@@ -284,18 +427,18 @@ BRANCHES['comm-beta']['platforms']['maco
 # SYMBOL_SERVER_* variables are setup in the environment section below
 BRANCHES['comm-beta']['platforms']['linux']['upload_symbols'] = True
 BRANCHES['comm-beta']['platforms']['linux64']['upload_symbols'] = True
 BRANCHES['comm-beta']['platforms']['win32']['upload_symbols'] = True
 BRANCHES['comm-beta']['platforms']['macosx64']['upload_symbols'] = True
 BRANCHES['comm-beta']['tinderbox_tree'] = 'Calendar-Beta'
 BRANCHES['comm-beta']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
 BRANCHES['comm-beta']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-beta']['platforms']['win32']['slaves'] = BUILDERS['win32']['community']
-BRANCHES['comm-beta']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.6']['momo']
+BRANCHES['comm-beta']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
+BRANCHES['comm-beta']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
 
 # This is used in a bunch of places where something needs to be run from
 # the objdir. This is necessary because of universal builds on Mac
 # creating subdirectories inside of the objdir.
 BRANCHES['comm-beta']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['comm-beta']['platforms']['linux64']['platform_objdir'] = OBJDIR
 BRANCHES['comm-beta']['platforms']['win32']['platform_objdir'] = OBJDIR
 BRANCHES['comm-beta']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
@@ -303,46 +446,55 @@ BRANCHES['comm-beta']['platforms']['linu
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
 }
 BRANCHES['comm-beta']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
 }
 BRANCHES['comm-beta']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/calbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltlbld/.ssh/calbld_dsa',
 }
 BRANCHES['comm-beta']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'DISABLE_LIGHTNING_INSTALL': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/cltbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
+
+    # See bug 758694
+    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
 }
 
 ######## lightning-aurora
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-aurora']['platforms'] = {
     'linux': {},
     'linux64': {},
     'win32': {},
@@ -362,17 +514,16 @@ BRANCHES['comm-aurora']['package'] = Fal
 BRANCHES['comm-aurora']['upload_stage'] = True
 BRANCHES['comm-aurora']['upload_complete_mar'] = False
 #Might be better off per-platform instead of per-branch here.
 BRANCHES['comm-aurora']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
 BRANCHES['comm-aurora']['stage_username'] = 'calbld'
 BRANCHES['comm-aurora']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
 BRANCHES['comm-aurora']['stage_group'] = 'calendar'
 BRANCHES['comm-aurora']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-aurora']['codesighs'] = False
 BRANCHES['comm-aurora']['l10n'] = False
 BRANCHES['comm-aurora']['l10n_tree'] = 'calendar10x'
 BRANCHES['comm-aurora']['l10n_repo'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['comm-aurora']['irc_nick'] = 'calbuild'
 BRANCHES['comm-aurora']['irc_channels'] = [ 'maildev', 'calendar' ]
 BRANCHES['comm-aurora']['extensions'] = {
     'lightning': {
         'subdir': "calendar/lightning",
@@ -406,18 +557,18 @@ BRANCHES['comm-aurora']['platforms']['ma
 # SYMBOL_SERVER_* variables are setup in the environment section below
 BRANCHES['comm-aurora']['platforms']['linux']['upload_symbols'] = True
 BRANCHES['comm-aurora']['platforms']['linux64']['upload_symbols'] = True
 BRANCHES['comm-aurora']['platforms']['win32']['upload_symbols'] = True
 BRANCHES['comm-aurora']['platforms']['macosx64']['upload_symbols'] = True
 BRANCHES['comm-aurora']['tinderbox_tree'] = 'Calendar-Aurora'
 BRANCHES['comm-aurora']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
 BRANCHES['comm-aurora']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-aurora']['platforms']['win32']['slaves'] = BUILDERS['win32']['community']
-BRANCHES['comm-aurora']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.6']['momo']
+BRANCHES['comm-aurora']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
+BRANCHES['comm-aurora']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
 
 # This is used in a bunch of places where something needs to be run from
 # the objdir. This is necessary because of universal builds on Mac
 # creating subdirectories inside of the objdir.
 BRANCHES['comm-aurora']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['comm-aurora']['platforms']['linux64']['platform_objdir'] = OBJDIR
 BRANCHES['comm-aurora']['platforms']['win32']['platform_objdir'] = OBJDIR
 BRANCHES['comm-aurora']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
@@ -425,171 +576,194 @@ BRANCHES['comm-aurora']['platforms']['li
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
 }
 BRANCHES['comm-aurora']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+
+    # Bug 779192
+    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
 }
 BRANCHES['comm-aurora']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/calbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
+    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
 }
 BRANCHES['comm-aurora']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR,
     'TINDERBOX_OUTPUT': '1',
     'MOZ_CRASHREPORTER_NO_REPORT': '1',
     'DISABLE_LIGHTNING_INSTALL': '1',
     'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
     'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
     'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
     'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/cltbld/.ssh/calbld_dsa',
+    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
+    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+
+    # See bug 758694
+    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
 }
-
 ######## lightning-trunk
 # All platforms being built for this branch MUST be listed here.
-BRANCHES['comm-central']['platforms'] = {
-    'linux': {},
-    'linux64': {},
-    'win32': {},
-    'macosx64': {}
-}
-
-BRANCHES['comm-central']['mozilla_central_branch'] = 'mozilla-central'
-BRANCHES['comm-central']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
-BRANCHES['comm-central']['branch_name'] = 'comm-central'
-BRANCHES['comm-central']['hg_branch'] = 'comm-central'
-BRANCHES['comm-central']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman']
-BRANCHES['comm-central']['mozconfig'] = 'mozconfig-lightning'
-# Period for comm-central disabled in master.cfg
-BRANCHES['comm-central']['period'] = 60 * 60 * 10
-# Lightning doesn't need to package Thunderbird
-BRANCHES['comm-central']['package'] = False
-BRANCHES['comm-central']['upload_stage'] = True
-BRANCHES['comm-central']['upload_complete_mar'] = False
-#Might be better off per-platform instead of per-branch here.
-BRANCHES['comm-central']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
-BRANCHES['comm-central']['stage_username'] = 'calbld'
-BRANCHES['comm-central']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
-BRANCHES['comm-central']['stage_group'] = 'calendar'
-BRANCHES['comm-central']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-central']['codesighs'] = False
-BRANCHES['comm-central']['l10n'] = False
-BRANCHES['comm-central']['l10n_tree'] = 'calendar11x'
-BRANCHES['comm-central']['l10n_repo'] = 'l10n-central'
-BRANCHES['comm-central']['irc_nick'] = 'lt-trunk-builds'
-BRANCHES['comm-central']['irc_channels'] = [ 'calendar' ]
-
-BRANCHES['comm-central']['extensions'] = {
-    'lightning': {
-        'subdir': "calendar/lightning",
-        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
-        'l10n': True
-    }
-}
-BRANCHES['comm-central']['platforms']['linux']['base_name'] = 'Linux comm-central lightning'
-BRANCHES['comm-central']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-central lightning'
-BRANCHES['comm-central']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-central lightning'
-BRANCHES['comm-central']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-central lightning'
-BRANCHES['comm-central']['platforms']['linux']['profiled_build'] = False
-BRANCHES['comm-central']['platforms']['linux64']['profiled_build'] = False
-BRANCHES['comm-central']['platforms']['win32']['profiled_build'] = False
-BRANCHES['comm-central']['platforms']['macosx64']['profiled_build'] = False
-BRANCHES['comm-central']['platforms']['linux']['milestone'] = "comm-central/linux-xpi"
-BRANCHES['comm-central']['platforms']['linux64']['milestone'] = "comm-central/linux64-xpi"
-BRANCHES['comm-central']['platforms']['win32']['milestone'] = "comm-central/win32-xpi"
-BRANCHES['comm-central']['platforms']['macosx64']['milestone'] = "comm-central/macosx-xpi"
-BRANCHES['comm-central']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
-
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-central']['create_snippet'] = False
-BRANCHES['comm-central']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
-BRANCHES['comm-central']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
-BRANCHES['comm-central']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
-BRANCHES['comm-central']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
-# If True, 'make buildsymbols' and 'make uploadsymbols' will be run
-# SYMBOL_SERVER_* variables are setup in the environment section below
-BRANCHES['comm-central']['platforms']['linux']['upload_symbols'] = True
-BRANCHES['comm-central']['platforms']['linux64']['upload_symbols'] = True
-BRANCHES['comm-central']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['comm-central']['platforms']['macosx64']['upload_symbols'] = True
-BRANCHES['comm-central']['tinderbox_tree'] = 'CalendarTrunk'
-BRANCHES['comm-central']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
-BRANCHES['comm-central']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-central']['platforms']['win32']['slaves'] = BUILDERS['win32']['community']
-BRANCHES['comm-central']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.6']['momo']
-
-# This is used in a bunch of places where something needs to be run from
-# the objdir. This is necessary because of universal builds on Mac
-# creating subdirectories inside of the objdir.
-BRANCHES['comm-central']['platforms']['linux']['platform_objdir'] = OBJDIR
-BRANCHES['comm-central']['platforms']['linux64']['platform_objdir'] = OBJDIR
-BRANCHES['comm-central']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['comm-central']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
-BRANCHES['comm-central']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-}
-BRANCHES['comm-central']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-}
-BRANCHES['comm-central']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/calbld/.ssh/calbld_dsa',
-}
-BRANCHES['comm-central']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'DISABLE_LIGHTNING_INSTALL': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/cltbld/.ssh/calbld_dsa',
-}
-
+#BRANCHES['comm-central']['platforms'] = {
+#    'linux': {},
+#    'linux64': {},
+#    'win32': {},
+#    'macosx64': {}
+#}
+#
+#BRANCHES['comm-central']['mozilla_central_branch'] = 'mozilla-central'
+#BRANCHES['comm-central']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
+#BRANCHES['comm-central']['branch_name'] = 'comm-central'
+#BRANCHES['comm-central']['hg_branch'] = 'comm-central'
+#BRANCHES['comm-central']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman']
+#BRANCHES['comm-central']['mozconfig'] = 'mozconfig-lightning'
+## Period for comm-central disabled in master.cfg
+#BRANCHES['comm-central']['period'] = 60 * 60 * 10
+## Lightning doesn't need to package Thunderbird
+#BRANCHES['comm-central']['package'] = False
+#BRANCHES['comm-central']['upload_stage'] = True
+#BRANCHES['comm-central']['upload_complete_mar'] = False
+##Might be better off per-platform instead of per-branch here.
+#BRANCHES['comm-central']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
+#BRANCHES['comm-central']['stage_username'] = 'calbld'
+#BRANCHES['comm-central']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
+#BRANCHES['comm-central']['stage_group'] = 'calendar'
+#BRANCHES['comm-central']['stage_ssh_key'] = 'calbld_dsa'
+#BRANCHES['comm-central']['l10n'] = False
+#BRANCHES['comm-central']['l10n_tree'] = 'calendar11x'
+#BRANCHES['comm-central']['l10n_repo'] = 'l10n-central'
+#BRANCHES['comm-central']['irc_nick'] = 'lt-trunk-builds'
+#BRANCHES['comm-central']['irc_channels'] = [ 'calendar' ]
+#
+#BRANCHES['comm-central']['extensions'] = {
+#    'lightning': {
+#        'subdir': "calendar/lightning",
+#        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
+#        'l10n': True
+#    }
+#}
+#BRANCHES['comm-central']['platforms']['linux']['base_name'] = 'Linux comm-central lightning'
+#BRANCHES['comm-central']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-central lightning'
+#BRANCHES['comm-central']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-central lightning'
+#BRANCHES['comm-central']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-central lightning'
+#BRANCHES['comm-central']['platforms']['linux']['profiled_build'] = False
+#BRANCHES['comm-central']['platforms']['linux64']['profiled_build'] = False
+#BRANCHES['comm-central']['platforms']['win32']['profiled_build'] = False
+#BRANCHES['comm-central']['platforms']['macosx64']['profiled_build'] = False
+#BRANCHES['comm-central']['platforms']['linux']['milestone'] = "comm-central/linux-xpi"
+#BRANCHES['comm-central']['platforms']['linux64']['milestone'] = "comm-central/linux64-xpi"
+#BRANCHES['comm-central']['platforms']['win32']['milestone'] = "comm-central/win32-xpi"
+#BRANCHES['comm-central']['platforms']['macosx64']['milestone'] = "comm-central/macosx-xpi"
+#BRANCHES['comm-central']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
+#
+## If True, a complete update snippet for this branch will be generated and
+## uploaded to. Any platforms with 'debug' in them will not have snippets
+## generated.
+#BRANCHES['comm-central']['create_snippet'] = False
+#BRANCHES['comm-central']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
+#BRANCHES['comm-central']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
+#BRANCHES['comm-central']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
+#BRANCHES['comm-central']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
+## If True, 'make buildsymbols' and 'make uploadsymbols' will be run
+## SYMBOL_SERVER_* variables are setup in the environment section below
+#BRANCHES['comm-central']['platforms']['linux']['upload_symbols'] = True
+#BRANCHES['comm-central']['platforms']['linux64']['upload_symbols'] = True
+#BRANCHES['comm-central']['platforms']['win32']['upload_symbols'] = True
+#BRANCHES['comm-central']['platforms']['macosx64']['upload_symbols'] = True
+#BRANCHES['comm-central']['tinderbox_tree'] = 'CalendarTrunk'
+#BRANCHES['comm-central']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
+#BRANCHES['comm-central']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
+#BRANCHES['comm-central']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
+#BRANCHES['comm-central']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
+#
+## This is used in a bunch of places where something needs to be run from
+## the objdir. This is necessary because of universal builds on Mac
+## creating subdirectories inside of the objdir.
+#BRANCHES['comm-central']['platforms']['linux']['platform_objdir'] = OBJDIR
+#BRANCHES['comm-central']['platforms']['linux64']['platform_objdir'] = OBJDIR
+#BRANCHES['comm-central']['platforms']['win32']['platform_objdir'] = OBJDIR
+#BRANCHES['comm-central']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
+#BRANCHES['comm-central']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
+#    'MOZ_OBJDIR': OBJDIR,
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+#    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+#
+#    # Bug 779192
+#    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
+#}
+#BRANCHES['comm-central']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
+#    'MOZ_OBJDIR': OBJDIR,
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
+#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+#
+#    # Bug 779192
+#    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
+#}
+#BRANCHES['comm-central']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
+#    'MOZ_OBJDIR': OBJDIR,
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+#    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
+#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+#}
+#BRANCHES['comm-central']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
+#    'MOZ_OBJDIR': OBJDIR,
+#    'TINDERBOX_OUTPUT': '1',
+#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
+#    'DISABLE_LIGHTNING_INSTALL': '1',
+#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
+#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
+#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
+#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
+#    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
+#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
+#
+#    # See bug 758694
+#    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
+#}
 # Release automation expect to find these
 STAGE_BASE_PATH=DEFAULTS['stage_base_path']
 COMPARE_LOCALES_TAG = 'RELEASE_AUTOMATION'
 
 if __name__ == "__main__":
     import sys, pprint
     args = sys.argv[1:]
 
--- a/calendar/l10n-calendar-changesets
+++ b/calendar/l10n-calendar-changesets
@@ -1,41 +1,16 @@
-bg 973f3fb4a688
-ca 64ab39bef53f
-cs f4eed0e2c385
-da 2708376f3f42
-de 726d319bb757
-en-GB 0ac3ddb41367
-es-AR 4cd997dbf47c
-es-ES af38ed9bd918
-et 6b3fbcf956e5
-eu 32b8fcd519ca
-fi 7d791a1e36cd
-fr 949f5c63858c
-fy-NL 06373f09b889
-ga-IE feec1e224622
-gd 993a52fbb3cb
-gl fc3eac695d75
-he 261bc03b3dda
-hr d02a73dda986
-hu e1aedc7de994
-id d5fe9bc3d527
-is 66235aff1537
-it 74778247fecd
-ja f861f4d8fe32
-ja-JP-mac 56545cd14fbd
-ko c92c12310816
-lt 5b604edb3670
-nb-NO 5ca825bdb70f
-nl ac4eb5b67922
-nn-NO 06637d3e14ce
-pa-IN ff6a8be08f45
-pl 7a835bb3c653
-pt-PT e1638fc85369
-ru 578bff30bfeb
-sk aecf9e4c1827
-sl 0f936c53bb03
-sq b8590ac3acdf
-sv-SE 64e01398f64a
-tr 27288e827cda
-uk 0710f8edd867
-zh-CN 7bcbcae7a46e
-zh-TW 1abb3470b9b9
+ca f85feec787ee
+cs d80e7fa186bd
+da 2ee323da7783
+de cee9aaea1cdb
+en-GB 740acfc6df78
+fi 3d74c9a61264
+fr 77dc508559ef
+fy-NL 7fcbe9fdd60d
+ga-IE f1b61da99424
+gd 92dcb67d3215
+it 08b8f34f34f3
+ja aa34db2d19f1
+ja-JP-mac c6337c097841
+lt f1c24d48fb64
+zh-CN bab90cec0e82
+zh-TW b37a393dccba
--- a/calendar/linux/comm-aurora/mozconfig-lightning
+++ b/calendar/linux/comm-aurora/mozconfig-lightning
@@ -1,32 +1,31 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
-
-
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-
-
-
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
copy from calendar/linux/comm-aurora/mozconfig-lightning
copy to calendar/linux/comm-aurora/release/mozconfig
--- a/calendar/linux/comm-aurora/mozconfig-lightning
+++ b/calendar/linux/comm-aurora/release/mozconfig
@@ -1,32 +1,32 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
-
-
+ac_add_options --with-l10n-base=../../l10n
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-
-
-
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux/comm-beta/mozconfig-lightning
+++ b/calendar/linux/comm-beta/mozconfig-lightning
@@ -1,32 +1,31 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
-
-
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
+
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-
-
-
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux/comm-beta/release/mozconfig
+++ b/calendar/linux/comm-beta/release/mozconfig
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../l10n
 
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
@@ -19,14 +18,15 @@ export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-
-
-
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux/comm-central/mozconfig-lightning
+++ b/calendar/linux/comm-central/mozconfig-lightning
@@ -1,23 +1,30 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+# Enable parallel compiling
+CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
new file mode 100644
--- /dev/null
+++ b/calendar/linux/comm-esr17/mozconfig-lightning
@@ -0,0 +1,31 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-optimize
+ac_add_options --enable-update-channel=aurora
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+
+CC=/tools/gcc-4.5/bin/gcc
+CXX=/tools/gcc-4.5/bin/g++
+
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+# Enable parallel compiling
+CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
new file mode 100644
--- /dev/null
+++ b/calendar/linux/comm-esr17/release/mozconfig
@@ -0,0 +1,32 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-optimize
+ac_add_options --enable-update-channel=aurora
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+ac_add_options --with-l10n-base=../../l10n
+
+
+CC=/tools/gcc-4.5/bin/gcc
+CXX=/tools/gcc-4.5/bin/g++
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+# Enable parallel compiling
+CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux/comm-release/mozconfig-lightning
+++ b/calendar/linux/comm-release/mozconfig-lightning
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
@@ -19,14 +18,15 @@ export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
-
-
-
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux/comm-release/release/mozconfig
+++ b/calendar/linux/comm-release/release/mozconfig
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=aurora
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../l10n
 
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
--- a/calendar/linux64/comm-aurora/mozconfig-lightning
+++ b/calendar/linux64/comm-aurora/mozconfig-lightning
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
@@ -23,8 +22,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
copy from calendar/linux64/comm-aurora/mozconfig-lightning
copy to calendar/linux64/comm-aurora/release/mozconfig
--- a/calendar/linux64/comm-aurora/mozconfig-lightning
+++ b/calendar/linux64/comm-aurora/release/mozconfig
@@ -1,16 +1,16 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
+ac_add_options --with-l10n-base=../../l10n
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
@@ -23,8 +23,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
--- a/calendar/linux64/comm-beta/mozconfig-lightning
+++ b/calendar/linux64/comm-beta/mozconfig-lightning
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
@@ -23,8 +22,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
--- a/calendar/linux64/comm-beta/release/mozconfig
+++ b/calendar/linux64/comm-beta/release/mozconfig
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../l10n
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
@@ -24,8 +23,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
--- a/calendar/linux64/comm-central/mozconfig-lightning
+++ b/calendar/linux64/comm-central/mozconfig-lightning
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
@@ -23,8 +22,15 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
new file mode 100644
--- /dev/null
+++ b/calendar/linux64/comm-esr17/mozconfig-lightning
@@ -0,0 +1,36 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-optimize
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+
+CC=/tools/gcc-4.5/bin/gcc
+CXX=/tools/gcc-4.5/bin/g++
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
+
+# Enable parallel compiling
+CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
new file mode 100644
--- /dev/null
+++ b/calendar/linux64/comm-esr17/release/mozconfig
@@ -0,0 +1,37 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-optimize
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+ac_add_options --with-l10n-base=../../l10n
+
+CC=/tools/gcc-4.5/bin/gcc
+CXX=/tools/gcc-4.5/bin/g++
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+#Use ccache
+ac_add_options --with-ccache=/usr/bin/ccache
+
+# Enable parallel compiling
+CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
+
+# Temporary workaround for bug 800798
+ac_add_options --disable-webrtc
--- a/calendar/linux64/comm-release/mozconfig-lightning
+++ b/calendar/linux64/comm-release/mozconfig-lightning
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
@@ -23,8 +22,12 @@ export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 # Enable parallel compiling
 CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
+
+# Temporary workaround for bug 794500
+ac_add_options --enable-gnomevfs
+ac_add_options --disable-gio
--- a/calendar/linux64/comm-release/release/mozconfig
+++ b/calendar/linux64/comm-release/release/mozconfig
@@ -1,16 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../l10n
 
 CC=/tools/gcc-4.5/bin/gcc
 CXX=/tools/gcc-4.5/bin/g++
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 export CFLAGS="-gdwarf-2"
--- a/calendar/macosx/comm-aurora/mozconfig-lightning
+++ b/calendar/macosx/comm-aurora/mozconfig-lightning
@@ -1,46 +1,41 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
 mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
 . $topsrcdir/build/macosx/universal/mozconfig.common
 export MOZ_PKG_VERSION=mac
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
+
+# Enable parallel compiling
+CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx/comm-central/mozconfig-lightning
+++ b/calendar/macosx/comm-central/mozconfig-lightning
@@ -1,47 +1,42 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
 mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
 . $topsrcdir/build/macosx/universal/mozconfig.common
 export MOZ_PKG_VERSION=mac
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
+
+# Enable parallel compiling
+CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-aurora/mozconfig-lightning
+++ b/calendar/macosx64/comm-aurora/mozconfig-lightning
@@ -1,51 +1,45 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
copy from calendar/macosx64/comm-aurora/mozconfig-lightning
copy to calendar/macosx64/comm-aurora/release/mozconfig
--- a/calendar/macosx64/comm-aurora/mozconfig-lightning
+++ b/calendar/macosx64/comm-aurora/release/mozconfig
@@ -1,51 +1,46 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
+ac_add_options --with-l10n-base=../../../l10n
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-beta/mozconfig-lightning
+++ b/calendar/macosx64/comm-beta/mozconfig-lightning
@@ -1,51 +1,45 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-beta/release/mozconfig
+++ b/calendar/macosx64/comm-beta/release/mozconfig
@@ -1,39 +1,33 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../../l10n
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
@@ -41,12 +35,13 @@ ac_add_options --enable-debug-symbols="-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+# XXX temporary
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-central/mozconfig-lightning
+++ b/calendar/macosx64/comm-central/mozconfig-lightning
@@ -1,51 +1,45 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
new file mode 100644
--- /dev/null
+++ b/calendar/macosx64/comm-esr17/mozconfig-lightning
@@ -0,0 +1,46 @@
+if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
+fi
+
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Don't try and install lightning - we just need to have it built for it to
+# be uploaded
+DISABLE_LIGHTNING_INSTALL=1
+
+#Use ccache
+#ac_add_options --with-ccache=/opt/local/bin/ccache
+# Enable parallel compiling
+CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
new file mode 100644
--- /dev/null
+++ b/calendar/macosx64/comm-esr17/release/mozconfig
@@ -0,0 +1,48 @@
+if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
+CC=/tools/clang/bin/clang
+CXX=/tools/clang/bin/clang++
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
+fi
+
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
+
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-tests
+ac_add_options --with-l10n-base=../../../l10n
+
+export CFLAGS="-gdwarf-2"
+export CXXFLAGS="-gdwarf-2"
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+ac_add_options --enable-debug-symbols="-gdwarf-2"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Don't try and install lightning - we just need to have it built for it to
+# be uploaded
+DISABLE_LIGHTNING_INSTALL=1
+
+#Use ccache
+# XXX temporary
+#ac_add_options --with-ccache=/opt/local/bin/ccache
+# Enable parallel compiling
+CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
+mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-release/mozconfig-lightning
+++ b/calendar/macosx64/comm-release/mozconfig-lightning
@@ -1,51 +1,43 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+# XXX temporary
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/macosx64/comm-release/release/mozconfig
+++ b/calendar/macosx64/comm-release/release/mozconfig
@@ -1,39 +1,30 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   # We need some hackery to deal with the mozilla/ build system calling this
   # mozconfig.
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi
 
 mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-tests
-ac_add_options --disable-codesighs
 ac_add_options --with-l10n-base=../../../l10n
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
@@ -41,12 +32,13 @@ ac_add_options --enable-debug-symbols="-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Don't try and install lightning - we just need to have it built for it to
 # be uploaded
 DISABLE_LIGHTNING_INSTALL=1
 
 #Use ccache
-ac_add_options --with-ccache=/opt/local/bin/ccache
+# XXX temporary
+#ac_add_options --with-ccache=/opt/local/bin/ccache
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
--- a/calendar/master.cfg
+++ b/calendar/master.cfg
@@ -60,17 +60,17 @@ from buildbot.steps.shell import Compile
 import buildbotcustom.changes.hgpoller
 import buildbotcustom.steps.misc
 import buildbotcustom.steps.test
 import buildbotcustom.steps.transfer
 import buildbotcustom.steps.updates
 #import buildbotcustom.status.tinderbox
 
 from buildbotcustom.steps.test import AliveTest, CompareBloatLogs, \
-  CompareLeakLogs, Codesighs
+  CompareLeakLogs
 
 import buildbotcustom.steps.misc
 reload(buildbotcustom.steps.misc)
 from buildbotcustom.steps.misc import SetMozillaBuildProperties, GetHgRevision, MozillaClobberer
 import buildbotcustom.steps.unittest as unittest_steps
 from buildbotcustom.steps.transfer import MozillaStageUpload
 from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
 
@@ -172,42 +172,42 @@ for name in sorted(BRANCHES.keys()):
     if builder_type == "check" or builder_type == "bloat":
         error_parser = "unittest"
 
     # Currently, each branch goes to a different tree
     # If this changes in the future this may have to be
     # moved out of the loop
     tinderbox_tree = getConfig(DEFAULTS, branch, 'tinderbox_tree')
     c['status'].append(TinderboxMailNotifier(
-        fromaddr="gozer@mozillamessaging.com",
+        fromaddr="calendar.buildbot@build.mozilla.org",
         tree=tinderbox_tree,
-        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org", ],
-        relayhost="mx.mozillamessaging.com",
+        extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>", ],
+        relayhost="mail.build.mozilla.org",
         builders=allBuilders,
         logCompression="bzip2",
         errorparser = error_parser, 
     ))
     if l10n:
         # This notifies all l10n related build objects to Mozilla-l10n
         c['status'].append(TinderboxMailNotifier(
-            fromaddr="gozer@mozillamessaging.com",
+            fromaddr="calendar.buildbot@build.mozilla.org",
             tree="Mozilla-l10n",
-            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-            relayhost="mx.mozillamessaging.com",
+            extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>"],
+            relayhost="mail.build.mozilla.org",
             logCompression="bzip2",
             builders=localeBuilders,
             binaryURL="%s/nightly/latest-%s-l10n/" % (download_base_url, branch_name),
         ))
         # We only want the builds from the specified builders
         # since their builds have a build property called "locale"
         c['status'].append(TinderboxMailNotifier(
-            fromaddr="gozer@mozillamessaging.com",
+            fromaddr="calendar.buildbot@build.mozilla.org",
             tree=WithProperties("Mozilla-l10n-%(locale)s"),
-            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-            relayhost="mx.mozillamessaging.com",
+            extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>"],
+            relayhost="mail.build.mozilla.org",
             logCompression="bzip2",
             builders=localeBuilders,
             binaryURL="%s/nightly/latest-%s-l10n/" % (download_base_url, branch_name),
         ))
         
 
     if DEFAULTS['irc'] and branch.get('irc_nick') and branch.get('irc_channels'):
         c['status'].append(IRC(
@@ -273,34 +273,33 @@ for name in sorted(BRANCHES.keys()):
 
     for platform in branch['platforms'].keys():
         # no need to have a whole new directory just for logs.
         # let's put these in their non-debug counterpart
         # translates to, eg:
         #  /home/ftp/pub/calendar/sunbird/tinderbox-builds/comm-central-linux
 
         #XXX: Kludge
-        realPlatform = platform.replace('-debug', '').replace('64', '').replace('-shark', '')
+        realPlatform = platform.replace('-debug', '').replace('64', '')
         realPlatform = realPlatform.replace('-10.5','')
         realPlatform = realPlatform.replace('-10.6','')
 
         logUploadDir = 'tinderbox-builds/%s-%s/' % (name, platform)
 
         lockname = 'lock-%s-%s-dep' % (name, platform)
         lock = locks.SlaveLock(lockname)
 
         # shorthand
         pf = branch['platforms'][platform]
 
         # Milestone controls where things get uploaded on stage
         milestone = pf.get('milestone',  branch.get('milestone', DEFAULTS.get('milestone', name)))
         if debug:
             print "Branch: %s Platform: %s Milestone: %s" % (name, platform, milestone)
 
-        codesighs = pf.get('codesighs', getConfig(DEFAULTS, branch, 'codesighs'))
         upload_stage = pf.get('upload_stage', getConfig(DEFAULTS, branch, 'upload_stage'))
         l10n = pf.get('l10n', getConfig(DEFAULTS, branch, 'l10n'))
         build_space = pf.get('build_space', getConfig(DEFAULTS, branch, 'build_space'))
 
         upload_glob = None
         if branch.get('upload_glob'):
             upload_glob="%s/%s" % (pf['platform_objdir'], branch['upload_glob'])
         if pf.get('upload_glob'):
@@ -454,17 +453,17 @@ for name in sorted(BRANCHES.keys()):
         mozilla2_dep_factory.addStep(ShellCommand(
             command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
         ))
         mozilla2_dep_factory.addStep(ShellCommand(
             command=['python', 'client.py' ] + branch['client_py_args'] + ['checkout'],
             description=['running', 'client.py', 'checkout'],
             descriptionDone=['python', 'client.py', 'checkout'],
             haltOnFailure=True,
-            timeout=60*60,
+            timeout=2*60*60,
         ))
         mozilla2_dep_factory.addStep(GetHgRevision(
             workdir='build/mozilla'
         ))
         changesetLink = '<a href=%s%s/rev' % (HGURL, mozilla_branch)
 
         link_tag = 'moz'
         if mozilla_branch == 'mozilla-central':
@@ -555,50 +554,21 @@ for name in sorted(BRANCHES.keys()):
             # XXX Hack to allow calendar to run xpcshell-tests
             if platform.find("macosx") == -1:
                 mozilla2_dep_factory.addStep(unittest_steps.MozillaCheck,
                                              test_name="xpcshell-tests",
                                              warnOnWarnings=True,
                                              workdir="build/%s/calendar/test" % pf['platform_objdir'],
                                              timeout=5*60, # 5 minutes.
                                              )
-            if codesighs:
-                if platform.find('win32') == -1 and platform.find('linux64') == -1:
-                    # Codesighs
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['make'],
-                        workdir='build/%s/mozilla/tools/codesighs' % pf['platform_objdir']
-                    ))
-                    # TODO change to calendar when we support codesighs
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['wget', '-O', 'codesize-auto-old.log',
-                         'http://%s/pub/mozilla.org/thunderbird/%s/codesize-auto.log' %\
-                          (branch.get('stage_server',STAGE_SERVER), logUploadDir)],
-                        env=pf['env']
-                    ))
-                    mozilla2_dep_factory.addStep(Codesighs(
-                        objdir='../%s/mozilla' % pf['platform_objdir'],
-                        platform=realPlatform,
-                        workdir='build/mozilla',
-                        env=pf['env']
-                    ))
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['cat', 'codesize-auto-diff.log']
-                    ))
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['scp', '-o', 'User=%s' % branch.get('stage_username',STAGE_USERNAME),
-                         '-o', 'IdentityFile=~/.ssh/%s' % branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                         'codesize-auto.log',
-                         '%s:%s/%s' % (branch.get('stage_server',STAGE_SERVER), stage_base_path, logUploadDir)]
-                    ))
 
         mozilla2_dep_builder = {
             'name': '%s %s' % (pf['base_name'], builder_type),
             'slavenames': pf['slaves'],
-            'builddir': '%s-%s' % (name, platform),
+            'builddir': '%s-%s' % (DEFAULTS['hg_rev_shortnames'][name], platform),
             'factory': mozilla2_dep_factory,
             'category': name,
             'locks' : [lock],
         }
         c['builders'].append(mozilla2_dep_builder)
 
         lockname = 'lock-%s-%s-nightly' % (name, platform)
         lock = locks.SlaveLock(lockname)
@@ -676,17 +646,17 @@ for name in sorted(BRANCHES.keys()):
             import sys
             print >> sys.stderr, "client_py_args will be : %s" % client_py_args
 
         mozilla2_nightly_factory.addStep(ShellCommand(
             command=['python', 'client.py'] + client_py_args + ['checkout'],
             description=['running', 'client.py', 'checkout'],
             descriptionDone=['client.py', 'checkout'],
             haltOnFailure=True,
-            timeout=60*60,
+            timeout=2*60*60,
         ))
         mozilla2_nightly_factory.addStep(GetHgRevision(
             workdir='build/mozilla'
         ))
         changesetLink = '<a href=%s%s/rev' % (HGURL, mozilla_branch)
         changesetLink += '/%(hg_revision)s title="Built from Mozilla revision %(hg_revision)s">moz:%(hg_revision)s</a>'
         mozilla2_nightly_factory.addStep(ShellCommand(
             command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
@@ -839,17 +809,17 @@ for name in sorted(BRANCHES.keys()):
         nightly_slaves = pf['slaves']
         if nightly_builder:
             print >> sys.stderr, "%s nightly builder override: %s" % (pf['base_name'], nightly_builder)
             nightly_slaves = nightly_builder
 
         mozilla2_nightly_builder = {
             'name': '%s nightly' % pf['base_name'],
             'slavenames': nightly_slaves,
-            'builddir': '%s-%s-nightly' % (name, platform),
+            'builddir': '%s-%s-nightly' % (DEFAULTS['hg_rev_shortnames'][name], platform),
             'factory': mozilla2_nightly_factory,
             'category': name,
             'locks': [lock],
         }
         if nightly:
             c['builders'].append(mozilla2_nightly_builder)
 
         if l10n:
@@ -885,17 +855,17 @@ for name in sorted(BRANCHES.keys()):
                     buildSpace=build_space,
                     clobberURL=clobber_url,
                     clobberTime=30*24*7, #Hours before clobber
             )
 
             mozilla2_l10n_repack_builder = {
                 'name': '%s %s l10n' % (product_name, pf['base_name']),
                 'slavenames': pf['slaves'],
-                'builddir': '%s-%s-l10n-full' % (name, platform),
+                'builddir': '%s-%s-l10n-full' % (DEFAULTS['hg_rev_shortnames'][name], platform),
                 'factory': mozilla2_l10n_repack_factory,
                 'category': '%s-l10n' % name,
             }
             c['builders'].append(mozilla2_l10n_repack_builder)
             c['schedulers'].append(NightlyL10n(
                                    name='%s %s %s l10n nightly scheduler' % (product_name, platform, branch_name),
                                    platform=realPlatform,
                                    tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
@@ -926,17 +896,17 @@ for name in sorted(BRANCHES.keys()):
                     compareLocalesTag='RELEASE_AUTOMATION',
                     buildSpace=build_space,
                     clobberURL=clobber_url,
                     clobberTime=30*24*7, #Hours before clobber
             )
             mozilla2_l10n_repack_dep_builder = {
                 'name': '%s %s l10n build' % (product_name, pf['base_name']),
                 'slavenames': pf['slaves'],
-                'builddir': '%s-%s-l10n-dep' % (name, platform),
+                'builddir': '%s-%s-l10n-dep' % (DEFAULTS['hg_rev_shortnames'][name], platform),
                 'factory': mozilla2_l10n_repack_dep_factory,
                 'category': '%s-l10n' % name,
             }
             c['builders'].append(mozilla2_l10n_repack_dep_builder)
 
         if 'extensions' in branch:
             for extensionName in branch['extensions'].keys():
                 extension = branch['extensions'][extensionName]
@@ -973,17 +943,17 @@ for name in sorted(BRANCHES.keys()):
                         compareLocalesTag='RELEASE_AUTOMATION',
                         buildSpace=build_space,
                         clobberURL=clobber_url,
                         clobberTime=30*24*7, #Hours before clobber
                     )   
                     c['builders'].append({
                         'name': '%s l10n extension build' % pf['base_name'],
                         'slavenames': pf['slaves'],
-                        'builddir': '%s-%s-l10n-ext' % (name, platform),
+                        'builddir': '%s-%s-l10n-ext' % (DEFAULTS['hg_rev_shortnames'][name], platform),
                         'factory': ext_repack_factory,
                         'category': '%s-l10n' % name,
                     })  
                 c['schedulers'].append(NightlyL10n(
                                    name='%s %s l10n extension nightly scheduler' % (platform, branch_name),
                                    platform=realPlatform,
                                    tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
                                    builderNames=['%s l10n extension build' % pf['base_name']],
@@ -1014,17 +984,17 @@ c['status'].append(html.WebStatus(
 ####### PROJECT IDENTITY
 
 # the 'projectName' string will be used to describe the project that this
 # buildbot is working on. For example, it is used as the title of the
 # waterfall HTML page. The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 
 c['projectName'] = "Calendar"
-c['buildbotURL'] = "http://build.mozillamessaging.com/buildbot/calendar"
+c['buildbotURL'] = "https://calendar-master.mozillalabs.com"
 
 
 #XXX
 #c['schedulers'] = []
 
 def mergeRequests(builder, req1, req2):
     import copy
     r1 = copy.copy(req1.source)
--- a/calendar/mozillaleak.py
+++ b/calendar/mozillaleak.py
@@ -4,17 +4,17 @@ import os.path
 
 import buildbotcustom.steps.misc
 import buildbotcustom.steps.test
 import buildbotcustom.steps.transfer
 import buildbotcustom.steps.updates
 
 from buildbotcustom.steps.misc import SetMozillaBuildProperties
 from buildbotcustom.steps.test import AliveTest, CompareBloatLogs, \
-  CompareLeakLogs, Codesighs, GraphServerPost
+  CompareLeakLogs, GraphServerPost
 from buildbotcustom.steps.transfer import MozillaStageUpload
 from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
 
 from buildbot.steps.shell import SetProperty, WithProperties
 
 GRAPH_SERVER = 'graphs.mozilla.org'
 GRAPH_SELECTOR = '/server/collect.cgi'
 GRAPH_BRANCH = 'comm-central'
--- a/calendar/release_calendar.py
+++ b/calendar/release_calendar.py
@@ -1,25 +1,26 @@
 ### This needs to be filled in ###
 
 branchSuffix               = 'beta'
 
-sourceRepoRevision         = 'b7c2a5582b67'
-mozillaRepoRevision        = 'THUNDERBIRD_12_0b1_RELEASE'
+sourceRepoRevision         = '1fd7316f0e28'
+mozillaRepoRevision        = 'default'
 
-milestone                  = '12.0'
+milestone                  = '21.0'
 
-version                    = '1.4b1'
+version                    = '2.3b2'
 buildNumber                = 1
 
-oldVersion                 = '1.3'
+oldVersion                 = '2.3b1'
 oldBuildNumber             = 1
 
 relbranchOverride          = ''
 mozillaRelbranchOverride   = ''
+
 ### Nothing else needs to be changed ###
 
 hgUsername                 = 'calbld'
 hgSshKey                   = '~cltbld/.ssh/calbld_dsa'
 relbranchPrefix            = 'CAL'
 sourceRepoName             = 'comm-' + branchSuffix # buildbot branch name
 sourceRepoPath             = 'releases/' + sourceRepoName
 # If blank, automation will create its own branch based on COMM_<date>_RELBRANCH
@@ -33,18 +34,18 @@ inspectorRelbranchOverride = ''
 buildToolsRepoPath            = '' # leave empty if buildTools is not to be tagged
 buildToolsRepoRevision        = ''
 buildToolsRelbranchOverride   = ''
 venkmanRepoPath            = '' # leave empty if venkman is not to be tagged
 venkmanRepoRevision        = ''
 venkmanRelbranchOverride   = ''
 chatzillaCVSRoot           = ''
 chatzillaTimestamp         = '' # leave empty if chatzilla is not to be tagged
+l10nRevisionFile           = 'l10n-calendar-changesets'
 l10nRepoPath               = 'releases/l10n/mozilla-' + branchSuffix
-l10nRevisionFile           = 'l10n-calendar-changesets'
 toolsRepoPath              = 'build/tools'
 cvsroot                    = ':ext:calbld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
 productVersionFile         = 'calendar/sunbird/config/version.txt'
 # version-bump.pl needs an app name, which we have to hack a bit for Lightning.
 productBumpName            = 'calendar/sunbird'
 productName                = 'lightning'
 brandName                  = 'Lightning'
 appName                    = 'calendar'
--- a/calendar/release_master.py
+++ b/calendar/release_master.py
@@ -238,17 +238,16 @@ for platform in releasePlatforms:
         l10nRevisionFile=l10nRevisionFile,
         l10nRepoPath=l10nRepoPath,
         buildRevision='%s_RELEASE' % baseTag,
         stageServer=nightly_config.STAGE_SERVER,
         stageUsername=nightly_config.BRANCHES[sourceRepoName]['stage_username'],
         stageGroup=nightly_config.BRANCHES[sourceRepoName]['stage_group'],
         stageSshKey=nightly_config.BRANCHES[sourceRepoName]['stage_ssh_key'],
         stageBasePath=nightly_config.BRANCHES[sourceRepoName]['stage_base_path'],
-        codesighs=False,
         uploadPackages=True,
         uploadSymbols=True,
         createSnippet=False,
         doCleanup=True, # this will clean-up the mac build dirs, but not delete
                         # the entire thing
         buildSpace=10,
         productName=productName,
         ftpName=ftpName,
--- a/calendar/win32/comm-aurora/mozconfig-lightning
+++ b/calendar/win32/comm-aurora/mozconfig-lightning
@@ -1,17 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-tests
 
-#Bug 427627
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+. $topsrcdir/build/win32/mozconfig.vs2010
copy from calendar/win32/comm-aurora/mozconfig-lightning
copy to calendar/win32/comm-aurora/release/mozconfig
--- a/calendar/win32/comm-aurora/mozconfig-lightning
+++ b/calendar/win32/comm-aurora/release/mozconfig
@@ -1,17 +1,18 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-tests
+ac_add_options --with-l10n-base=../../l10n
 
-#Bug 427627
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+. $topsrcdir/build/win32/mozconfig.vs2010
--- a/calendar/win32/comm-beta/mozconfig-lightning
+++ b/calendar/win32/comm-beta/mozconfig-lightning
@@ -1,17 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-tests
 
-#Bug 427627
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+. $topsrcdir/build/win32/mozconfig.vs2010
--- a/calendar/win32/comm-beta/release/mozconfig
+++ b/calendar/win32/comm-beta/release/mozconfig
@@ -11,8 +11,9 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+. $topsrcdir/build/win32/mozconfig.vs2010
--- a/calendar/win32/comm-central/mozconfig-lightning
+++ b/calendar/win32/comm-central/mozconfig-lightning
@@ -1,17 +1,17 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --enable-tests
 
-#Bug 427627
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
+
+. $topsrcdir/build/win32/mozconfig.vs2010
new file mode 100644
--- /dev/null
+++ b/calendar/win32/comm-esr17/mozconfig-lightning
@@ -0,0 +1,17 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+
+ac_add_options --enable-jemalloc
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+. $topsrcdir/build/win32/mozconfig.vs2010
new file mode 100644
--- /dev/null
+++ b/calendar/win32/comm-esr17/release/mozconfig
@@ -0,0 +1,19 @@
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+ac_add_options --enable-update-channel=nightly
+ac_add_options --enable-update-packaging
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --with-l10n-base=../../l10n
+
+#Bug 427627
+ac_add_options --enable-jemalloc
+
+# For NSS symbols
+export MOZ_DEBUG_SYMBOLS=1
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+. $topsrcdir/build/win32/mozconfig.vs2010
--- a/calendar/win32/comm-release/release/mozconfig
+++ b/calendar/win32/comm-release/release/mozconfig
@@ -11,8 +11,9 @@ ac_add_options --with-l10n-base=../../l1
 ac_add_options --enable-jemalloc
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+. $topsrcdir/build/win32/mozconfig.vs2010
new file mode 100644
--- /dev/null
+++ b/dev-master_config.json.in
@@ -0,0 +1,28 @@
+[{
+  "basedir": "@BASEDIR@",
+  "bbconfigs_branch": "@BUILDBOTCONFIGS_BRANCH@",
+  "bbconfigs_dir": "@BASEDIR@/buildbot-configs",
+  "bbcustom_branch": "@BUILDBOTCUSTOM_BRANCH@",
+  "bbcustom_dir": "@BASEDIR@/buildbotcustom",
+  "buildbot_bin": "@BASEDIR@/bin/buildbot",
+  "buildbot_branch": "@BUILDBOT_BRANCH@",
+  "buildbot_python": "@BASEDIR@/bin/python",
+  "buildbot_setup": "@BASEDIR@/buildbot/master/setup.py",
+  "buildbot_version": "0.8.2",
+  "datacentre": "scl1",
+  "db_name": "dev-master01.build.scl1.mozilla.com:@BASEDIR@/master",
+  "enabled": true,
+  "environment": "staging",
+  "hostname": "dev-master01.build.scl1.mozilla.com",
+  "http_port": @HTTP_PORT@,
+  "master_dir": "@BASEDIR@/master",
+  "release_branches": ["mozilla-release", "mozilla-beta"],
+  "mobile_release_branches": ["mozilla-release", "mozilla-beta"],
+  "thunderbird_release_branches": ["comm-beta", "comm-release"],
+  "name": "@MASTER_NAME@",
+  "pb_port": @PB_PORT@,
+  "role": "@ROLE@",
+  "ssh_port": @SSH_PORT@,
+  "tools_branch": "@TOOLS_BRANCH@",
+  "tools_dir": "@BASEDIR@/tools"
+}]
deleted file mode 100644
--- a/geriatric/config.py
+++ /dev/null
@@ -1,57 +0,0 @@
-slaves = {
-    'fedora12-p3': ['p3-linux03'],
-    'xp-p3': ['p3-win03'],
-    '10.5-g4': ['g4-leopard01'],
-    '10.5-g5': ['bm-xserve%02d' % x for x in range(1,6)],
-}
-
-all_tests = ('xpcshell', 'crashtest', 'reftest', 'mochitest-plain')
-
-branches = {
-    'mozilla-1.9.2': {
-        'tinderbox_tree': 'GeriatricMachines',
-        'repo_path': 'releases/mozilla-1.9.2',
-        'platforms': {
-            'linux': {
-                'variants': ['fedora12-p3'],
-                'tests': all_tests,
-            },
-            'win32': {
-                'variants': ['xp-p3'],
-                'tests': all_tests,
-            },
-            'macosx': {
-                'variants': ['10.5-g4', '10.5-g5'],
-                'tests': all_tests,
-            },
-        },
-    },
-    'mozilla-2.0': {
-        'tinderbox_tree': 'GeriatricMachines',
-        'repo_path': 'releases/mozilla-2.0',
-        'platforms': {
-            'linux': {
-                'variants': ['fedora12-p3'],
-                'tests': all_tests,
-            },
-            'win32': {
-                'variants': ['xp-p3'],
-                'tests': all_tests,
-            },
-        },
-    },
-    'mozilla-central': {
-        'tinderbox_tree': 'GeriatricMachines',
-        'repo_path': 'releases/mozilla-1.9.2',
-        'platforms': {
-            'linux': {
-                'variants': ['fedora12-p3'],
-                'tests': all_tests,
-            },
-            'win32': {
-                'variants': ['xp-p3'],
-                'tests': all_tests,
-            },
-        },
-    },
-}
deleted file mode 100644
--- a/geriatric/master.cfg
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-c = BuildmasterConfig = {}
-
-import Slaves
-import config
-reload(Slaves)
-reload(config)
-from Slaves import slavepassword
-from config import branches, slaves
-c['slavePortnum'] = 9989
-
-####### CHANGESOURCES
-from buildbot.changes.pb import PBChangeSource
-c['change_source'] = []
-c['change_source'].append(PBChangeSource())
-
-####### BUILDERS and SCHEDULERS and SLAVES
-import buildbot.buildslave
-import buildbot.scheduler
-import buildbotcustom.steps.misc
-import buildbotcustom.process.factory
-import buildbotcustom.changes.ftppoller
-reload(buildbot.buildslave)
-reload(buildbot.scheduler)
-reload(buildbotcustom.steps.misc)
-reload(buildbotcustom.process.factory)
-reload(buildbotcustom.changes.ftppoller)
-from buildbot.buildslave import BuildSlave
-from buildbot.scheduler import Scheduler
-from buildbot.status import html
-from buildbot.status.tinderbox import TinderboxMailNotifier
-from buildbotcustom.steps.misc import SendChangeStep
-from buildbotcustom.process.factory import UnittestPackagedBuildFactory
-
-c['slaves'] = []
-c['schedulers'] = []
-c['builders'] = []
-c['status'] = []
-c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
-
-for slave_type in slaves.keys():
-    for slave in slaves[slave_type]:
-        print 'Creating BuildSlave for %s' % slave
-        c['slaves'].append(BuildSlave(slave, slavepassword, max_builds=1))
-
-for branch in branches.keys():
-    builders = []
-    print 'Branch %s' % branch
-    for platform in branches[branch]['platforms'].keys():
-        print 'Platform %s' % platform
-        platform_builders = []
-        for variant in branches[branch]['platforms'][platform]['variants']:
-            print 'Variant %s' % variant
-            variant_slaves = slaves[variant]
-            for suite in branches[branch]['platforms'][platform]['tests']:
-                builder_name = '%s-%s-%s %s' % (branch, platform, variant, suite)
-                factory = UnittestPackagedBuildFactory(
-                            platform=platform,
-                            test_suites=(suite,), #factory does for suite in self.test_suites
-                            hgHost='hg.mozilla.org',
-                            repoPath=branches[branch]['repo_path'],
-                            buildToolsRepoPath='build/tools',
-                            buildSpace=1
-                )
-                builder = {
-                    'name': builder_name,
-                    'slavenames': variant_slaves,
-                    'builddir': builder_name,
-                    'factory': factory
-                }
-                builders.append(builder_name)
-                platform_builders.append(builder_name)
-                c['builders'].append(builder)
-        #We are assuming that only Opt builds are tested here.  By hardcoding the
-        #-opt-unittest, we don't need to continue having the special geriatric
-        #masters sendchange logic in the build master
-        scheduler_branch = '%s-%s-opt-unittest' % (branch, platform)
-        scheduler = Scheduler(name=scheduler_branch, branch=scheduler_branch,
-                            treeStableTimer=5, builderNames=platform_builders,
-        )
-        print 'Scheduler'
-        print scheduler.branch
-        c['schedulers'].append(scheduler)
-
-    c['status'].append(TinderboxMailNotifier(
-                       fromaddr='mozilla2.buildbot@build.mozilla.org',
-                       tree='GeriatricMachines',
-                       extraRecipients=['tinderbox-daemon@tinderbox.mozilla.org'],
-                       relayhost='mail.build.mozilla.org',
-                       builders=builders,
-                       logCompression='bzip2'
-                       )
-                )
-
-####### DEBUGGING OPTIONS
-#c['debugPassword'] = "debugpassword"
-#c['manhole'] = manhole.PasswordManhole("tcp:9999:interface=127.0.0.1",
-#                                       "admin", "password")
-
-####### PROJECT IDENTITY
-c['projectName'] = "Buildbot"
-c['projectURL'] = "http://buildbot.sourceforge.net/"
-c['buildbotURL'] = "http://10.250.48.137:8010/"
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -1,19 +1,48 @@
 SlavePasswords = {
     "linux": "pass",
     "linux64": "pass",
     "fedora": "pass",
+    "fedora-b2g": "pass",
+    "fedora-b2g-emulator": "pass",
     "fedora64": "pass",
+    "ubuntu32_vm": "pass",
+    "ubuntu32_vm-b2gdt": "pass",
+    "ubuntu32_hw": "pass",
+    "ubuntu64_vm": "pass",
+    "ubuntu64_vm-b2g": "pass",
+    "ubuntu64_vm-b2g-emulator": "pass",
+    "ubuntu64_vm-b2gdt": "pass",
+    "ubuntu64_hw": "pass",
+    "ubuntu64_hw-b2g": "pass",
+    "ubuntu64_hw-b2g-emulator": "pass",
     "tiger": "pass",
-    "leopard": "pass",
-    "leopard-o": "pass",
     "snowleopard": "pass",
     "lion": "pass",
+    "mountainlion": "pass",
     "xp": "pass",
+    "xp-ix": "pass",
     "win7": "pass",
+    "win7-ix": "pass",
+    "win8": "pass",
     "w764": "pass",
     "vista": "pass",
     "tegra_android": "pass",
-    "tegra_android-xul": "pass",
-    "tegra_android-o": "pass",
+    "tegra_android-armv6": "pass",
+    "tegra_android-noion": "pass",
+    "panda_android": "pass",
 }
 
+datazillaAuth = {
+    'talos': {
+        'oauthKey': 'blahblah',
+        'oauthSecret': 'blahblah',
+    },
+    'jetperf': {
+        'oauthKey': 'blahblah',
+        'oauthSecret': 'blahblah',
+    },
+    'test': {
+        'oauthKey': '84c76536-5bea-4858-990b-434ad3bbadc1',
+        'oauthSecret': '92e1d99d-fd5a-45a7-b07e-ec5a9f59c844',
+    },
+}
deleted file mode 100644
--- a/mozilla-tests/addonprefs.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 29e165d72867 mozilla-tests/config.py
---- a/mozilla-tests/config.py	Wed Mar 30 15:12:33 2011 -0700
-+++ b/mozilla-tests/config.py	Wed Mar 30 15:21:29 2011 -0700
-@@ -42,8 +42,8 @@
-     'svg': GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity'],
-     'scroll': GRAPH_CONFIG + ['--activeTests', 'tscroll'],
-     'dromaeo': GRAPH_CONFIG + ['--activeTests', 'dromaeo_basics:dromaeo_v8:dromaeo_sunspider:dromaeo_jslib:dromaeo_css:dromaeo_dom'],
--    'addon': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown'],
--    'addon-baseline': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown'],
-+    'addon': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown', '--sampleConfig', 'addon.config'],
-+    'addon-baseline': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown', '--sampleConfig', 'addon.config'],
-     'a11y': GRAPH_CONFIG + ['--activeTests', 'a11y'],
-     'remote-ts': GRAPH_CONFIG + ['--activeTests', 'ts', '--noChrome'],
-     'remote-tdhtml': GRAPH_CONFIG + ['--activeTests', 'tdhtml', '--noChrome'],
new file mode 100644
--- /dev/null
+++ b/mozilla-tests/b2g_config.py
@@ -0,0 +1,1502 @@
+from copy import deepcopy
+
+from config import MOZHARNESS_REBOOT_CMD
+from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS
+
+import b2g_localconfig
+reload(b2g_localconfig)
+import config_common
+reload(config_common)
+from config_common import nested_haskey
+
+GLOBAL_VARS = deepcopy(GLOBAL_VARS)
+
+GLOBAL_VARS['stage_username'] = 'ffxbld'
+GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
+
+BRANCHES = {
+    'ash': {},
+    'birch': {},
+    'cedar': {},
+    'cypress': {},
+    'fx-team': {},
+    'graphics': {},
+    'mozilla-b2g18': {},
+    'mozilla-b2g18_v1_0_1': {},
+    'mozilla-b2g18_v1_1_0_hd': {},
+    'mozilla-central': {},
+    'mozilla-inbound': {},
+    'services-central': {},
+    'ionmonkey': {},
+    'try': {'coallesce_jobs': False},
+}
+
+PLATFORMS = {
+    'ics_armv7a_gecko': {},
+    'linux32_gecko': {},
+    'linux64_gecko': {},
+    'b2g_emulator': {},
+}
+
+builder_prefix = "b2g"
+
+PLATFORMS['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu64_vm-b2g', 'ubuntu64_hw-b2g']
+PLATFORMS['ics_armv7a_gecko']['env_name'] = 'linux-perf'
+PLATFORMS['ics_armv7a_gecko']['fedora-b2g'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator"}
+PLATFORMS['ics_armv7a_gecko']['ubuntu64_vm-b2g'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator_vm"}
+PLATFORMS['ics_armv7a_gecko']['ubuntu64_hw-b2g'] = {'name': builder_prefix + "_ics_armv7a_gecko_emulator_hw"}
+PLATFORMS['ics_armv7a_gecko']['stage_product'] = 'b2g'
+PLATFORMS['ics_armv7a_gecko']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'use_mozharness': True,
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
+
+PLATFORMS['linux32_gecko']['slave_platforms'] = ['ubuntu32_vm-b2gdt', ]
+PLATFORMS['linux32_gecko']['env_name'] = 'linux-perf'
+PLATFORMS['linux32_gecko']['ubuntu32_vm-b2gdt'] = {'name': builder_prefix + "_ubuntu32_vm"}
+PLATFORMS['linux32_gecko']['stage_product'] = 'b2g'
+PLATFORMS['linux32_gecko']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'use_mozharness': True,
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
+
+PLATFORMS['linux64_gecko']['slave_platforms'] = ['ubuntu64_vm-b2gdt', ]
+PLATFORMS['linux64_gecko']['env_name'] = 'linux-perf'
+PLATFORMS['linux64_gecko']['ubuntu64_vm-b2gdt'] = {'name': builder_prefix + "_ubuntu64_vm"}
+PLATFORMS['linux64_gecko']['stage_product'] = 'b2g'
+PLATFORMS['linux64_gecko']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'use_mozharness': True,
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
+
+PLATFORMS['b2g_emulator']['slave_platforms'] = ['fedora-b2g-emulator', 'ubuntu64_vm-b2g-emulator', 'ubuntu64_hw-b2g-emulator']
+PLATFORMS['b2g_emulator']['env_name'] = 'linux-perf'
+PLATFORMS['b2g_emulator']['fedora-b2g-emulator'] = {'name': "b2g_emulator"}
+PLATFORMS['b2g_emulator']['ubuntu64_vm-b2g-emulator'] = {'name': "b2g_emulator_vm"}
+PLATFORMS['b2g_emulator']['ubuntu64_hw-b2g-emulator'] = {'name': "b2g_emulator_hw"}
+PLATFORMS['b2g_emulator']['stage_product'] = 'b2g'
+PLATFORMS['b2g_emulator']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'use_mozharness': True,
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
+
+# Lets be explicit instead of magical.
+for platform, platform_config in PLATFORMS.items():
+    for slave_platform in platform_config['slave_platforms']:
+        platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
+        if slave_platform in TRY_SLAVES:
+            platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
+        else:
+            platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
+
+BRANCH_UNITTEST_VARS = {
+    'hghost': 'hg.mozilla.org',
+    # turn on platforms as we get them running
+    'platforms': {
+        'ics_armv7a_gecko': {},
+        'linux32_gecko': {},
+        'linux64_gecko': {},
+        'b2g_emulator': {},
+    },
+}
+
+SUITES = {}
+
+MOCHITEST = [
+    ('mochitest-1', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-2', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-3', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-4', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-5', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-6', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-7', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-8', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('mochitest-9', {'suite': 'mochitest-plain',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+]
+REFTEST = [
+    ('reftest-1', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-2', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-3', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-4', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-5', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-6', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-7', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-8', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-9', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+    ('reftest-10', {'suite': 'reftest',
+                   'use_mozharness': True,
+                   'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+]
+
+REFTEST_SANITY = [
+    ('reftest', {'suite': 'reftest',
+                 'use_mozharness': True,
+                 'script_path': 'scripts/b2g_emulator_unittest.py',
+                },
+    ),
+]
+
+CRASHTEST = [
+    ('crashtest-1', {'suite': 'crashtest',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('crashtest-2', {'suite': 'crashtest',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+    ('crashtest-3', {'suite': 'crashtest',
+                     'use_mozharness': True,
+                     'script_path': 'scripts/b2g_emulator_unittest.py',
+                    },
+    ),
+]
+
+MARIONETTE = [
+    ('marionette-webapi', {'suite': 'marionette-webapi',
+                           'use_mozharness': True,
+                           'script_path': 'scripts/marionette.py',
+                          },
+    ),
+]
+
+XPCSHELL = [
+    ('xpcshell', {'suite': 'xpcshell',
+                  'use_mozharness': True,
+                  'script_path': 'scripts/b2g_emulator_unittest.py',
+                  },
+    ),
+]
+
+GAIA_UNITTESTS = [(
+    'gaia-unit', {
+        'suite': 'gaia-unit',
+        'use_mozharness': True,
+        'script_path': 'scripts/gaia_unit.py',
+    },
+)]
+
+ALL_UNITTESTS = MOCHITEST + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL
+
+# Default set of unit tests
+UNITTEST_SUITES = {
+    'opt_unittest_suites': ALL_UNITTESTS[:],
+    'debug_unittest_suites': [],
+}
+
+# You must define opt_unittest_suites when enable_opt_unittests is True for a
+# platform. Likewise debug_unittest_suites for enable_debug_unittests
+PLATFORM_UNITTEST_VARS = {
+    'ics_armv7a_gecko': {
+        'product_name': 'b2g',
+        'app_name': 'b2g',
+        'brand_name': 'Gecko',
+        'builds_before_reboot': 1,
+        'unittest-env': {'DISPLAY': ':0'},
+        'enable_opt_unittests': True,
+        'enable_debug_unittests': False,
+        'fedora-b2g': {
+            'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
+            'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
+            'suite_config': {
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                    ],
+                },
+                'marionette-webapi': {
+                    'extra_args': [
+                        "--cfg", "marionette/automation_emulator_config.py"
+                    ],
+                },
+                'mochitest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '1', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '2', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '3', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '4', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '5', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '6', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '7', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '8', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '9', '--total-chunks', '9',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                    ],
+                },
+                'xpcshell': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'xpcshell',
+                    ],
+                },
+            },
+        },
+        'ubuntu64_vm-b2g': {
+            'opt_unittest_suites': MOCHITEST + MARIONETTE + XPCSHELL + CRASHTEST,
+            'debug_unittest_suites': MOCHITEST + MARIONETTE + XPCSHELL + CRASHTEST,
+            'suite_config': {
+                'marionette-webapi': {
+                    'extra_args': [
+                        "--cfg", "marionette/automation_emulator_config.py"
+                    ],
+                },
+                'mochitest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '1', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '2', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '3', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '4', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '5', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '6', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '7', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '8', '--total-chunks', '9',
+                    ],
+                },
+                'mochitest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '9', '--total-chunks', '9',
+                    ],
+                },
+                'xpcshell': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'xpcshell',
+                    ],
+                },
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                    ],
+                },
+            },
+        },
+        'ubuntu64_hw-b2g': {
+            'opt_unittest_suites': REFTEST,
+            'debug_unittest_suites': REFTEST,
+            'suite_config': {
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                    ],
+                },
+            },
+        },
+    },  # end of ics_armv7a_gecko configs
+    'linux32_gecko': {
+        'product_name': 'b2g',
+        'app_name': 'b2g',
+        'brand_name': 'Gecko',
+        'builds_before_reboot': 1,
+        'unittest-env': {'DISPLAY': ':0'},
+        'enable_opt_unittests': True,
+        'enable_debug_unittests': False,
+        'ubuntu32_vm-b2gdt': {
+            'opt_unittest_suites': GAIA_UNITTESTS[:],
+            'debug_unittest_suites': [],
+            'suite_config': {
+                'gaia-unit': {
+                    'extra_args': [
+                        '--cfg', 'b2g/gaia_unit_production_config.py',
+                    ],
+                },
+            },
+        },
+    },
+    'linux64_gecko': {
+        'product_name': 'b2g',
+        'app_name': 'b2g',
+        'brand_name': 'Gecko',
+        'builds_before_reboot': 1,
+        'unittest-env': {'DISPLAY': ':0'},
+        'enable_opt_unittests': True,
+        'enable_debug_unittests': False,
+        'ubuntu64_vm-b2gdt': {
+            'opt_unittest_suites': GAIA_UNITTESTS[:],
+            'debug_unittest_suites': [],
+            'suite_config': {
+                'gaia-unit': {
+                    'extra_args': [
+                        '--cfg', 'b2g/gaia_unit_production_config.py',
+                    ],
+                },
+            },
+        },
+    },
+    'b2g_emulator': {
+        'product_name': 'b2g',
+        'app_name': 'b2g',
+        'brand_name': 'Gecko',
+        'builds_before_reboot': 1,
+        'unittest-env': {'DISPLAY': ':0'},
+        'enable_opt_unittests': True,
+        'enable_debug_unittests': False,
+        'fedora-b2g-emulator': {
+            'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
+            'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
+            'suite_config': {
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'marionette-webapi': {
+                    'extra_args': [
+                        "--cfg", "marionette/automation_emulator_config.py",
+                        '--no-update',
+                    ],
+                },
+                'mochitest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '1', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '2', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '3', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '4', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '5', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '6', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '7', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '8', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '9', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                        '--no-update',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'xpcshell': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'xpcshell',
+                        '--no-update',
+                    ],
+                },
+            },
+        },
+        'ubuntu64_vm-b2g-emulator': {
+            'opt_unittest_suites': MOCHITEST + MARIONETTE + XPCSHELL + CRASHTEST,
+            'debug_unittest_suites': MOCHITEST + MARIONETTE + XPCSHELL + CRASHTEST,
+            'suite_config': {
+                'marionette-webapi': {
+                    'extra_args': [
+                        "--cfg", "marionette/automation_emulator_config.py",
+                        '--no-update',
+                    ],
+                },
+                'mochitest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '1', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '2', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '3', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '4', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '5', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '6', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '7', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '8', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'mochitest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'mochitest',
+                        '--this-chunk', '9', '--total-chunks', '9',
+                        '--no-update',
+                    ],
+                },
+                'xpcshell': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'xpcshell',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                        '--no-update',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+            },
+        },
+        'ubuntu64_hw-b2g-dt': {
+            'opt_unittest_suites': REFTEST,
+            'debug_unittest_suites': REFTEST,
+            'suite_config': {
+                'crashtest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'crashtest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'crashtest',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                        '--no-update',
+                    ],
+                },
+                'reftest': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
+                        '--no-update',
+                    ],
+                },
+                'reftest-1': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '1', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-2': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '2', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '3', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-4': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '4', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-5': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '5', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-6': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '6', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-7': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '7', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-8': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '8', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-9': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '9', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+                'reftest-10': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_automation_config.py',
+                        '--test-suite', 'reftest',
+                        '--this-chunk', '10', '--total-chunks', '10',
+                        '--no-update',
+                    ],
+                },
+            },
+        },
+    },
+}
+
+# Copy unittest vars in first, then platform vars
+for branch in BRANCHES.keys():
+    for key, value in GLOBAL_VARS.items():
+        # Don't override platforms if it's set
+        if key == 'platforms' and 'platforms' in BRANCHES[branch]:
+            continue
+        BRANCHES[branch][key] = deepcopy(value)
+
+    for key, value in BRANCH_UNITTEST_VARS.items():
+        # Don't override platforms if it's set and locked
+        if key == 'platforms' and 'platforms' in BRANCHES[branch] and BRANCHES[branch].get('lock_platforms'):
+            continue
+        BRANCHES[branch][key] = deepcopy(value)
+
+    for platform, platform_config in PLATFORM_UNITTEST_VARS.items():
+        if platform in BRANCHES[branch]['platforms']:
+            for key, value in platform_config.items():
+                value = deepcopy(value)
+                if isinstance(value, str):
+                    value = value % locals()
+                BRANCHES[branch]['platforms'][platform][key] = value
+
+    # Copy in local config
+    if branch in b2g_localconfig.BRANCHES:
+        for key, value in b2g_localconfig.BRANCHES[branch].items():
+            if key == 'platforms':
+                # Merge in these values
+                if 'platforms' not in BRANCHES[branch]:
+                    BRANCHES[branch]['platforms'] = {}
+
+                for platform, platform_config in value.items():
+                    for key, value in platform_config.items():
+                        value = deepcopy(value)
+                        if isinstance(value, str):
+                            value = value % locals()
+                        BRANCHES[branch]['platforms'][platform][key] = value
+            else:
+                BRANCHES[branch][key] = deepcopy(value)
+
+#    # Merge in any project branch config for platforms
+#    if branch in ACTIVE_PROJECT_BRANCHES and PROJECT_BRANCHES[branch].has_key('platforms'):
+#        for platform, platform_config in PROJECT_BRANCHES[branch]['platforms'].items():
+#            if platform in PLATFORMS:
+#                for key, value in platform_config.items():
+#                    value = deepcopy(value)
+#                    if isinstance(value, str):
+#                        value = value % locals()
+#                    BRANCHES[branch]['platforms'][platform][key] = value
+
+    for platform, platform_config in b2g_localconfig.PLATFORM_VARS.items():
+        if platform in BRANCHES[branch]['platforms']:
+            for key, value in platform_config.items():
+                value = deepcopy(value)
+                if isinstance(value, str):
+                    value = value % locals()
+                BRANCHES[branch]['platforms'][platform][key] = value
+
+########
+# Entries in BRANCHES for tests should be a tuple of:
+# - Number of tests to run per build
+# - Whether queue merging is on
+# - TalosFactory options
+# - Which platforms to run on
+
+# Let's load the defaults
+for branch in BRANCHES.keys():
+    BRANCHES[branch]['repo_path'] = branch
+    BRANCHES[branch]['branch_name'] = branch.title()
+    BRANCHES[branch]['build_branch'] = branch.title()
+    BRANCHES[branch]['enable_unittests'] = True
+    BRANCHES[branch]['fetch_symbols'] = True
+    BRANCHES[branch]['fetch_release_symbols'] = False
+    BRANCHES[branch]['pgo_strategy'] = None
+    BRANCHES[branch]['pgo_platforms'] = []
+
+# The following are exceptions to the defaults
+
+BRANCHES['ash']['branch_name'] = "Ash"
+BRANCHES['ash']['repo_path'] = "projects/ash"
+BRANCHES['ash']['mozharness_repo'] = "http://hg.mozilla.org/users/asasaki_mozilla.com/ash-mozharness"
+BRANCHES['ash']['mozharness_tag'] = "default"
+BRANCHES['ash']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = ALL_UNITTESTS[:]
+BRANCHES['ash']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
+BRANCHES['birch']['branch_name'] = "Birch"
+BRANCHES['birch']['repo_path'] = "projects/birch"
+BRANCHES['cedar']['branch_name'] = "Cedar"
+BRANCHES['cedar']['repo_path'] = "projects/cedar"
+BRANCHES['cedar']['mozharness_tag'] = "default"
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = ALL_UNITTESTS[:]
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['ubuntu64_vm-b2g']['debug_unittest_suites'] = ALL_UNITTESTS[:]
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
+BRANCHES['cedar']['platforms']['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g', 'ubuntu64_vm-b2g', 'ubuntu64_hw-b2g']
+BRANCHES['cedar']['platforms']['b2g_emulator']['fedora-b2g-emulator']['debug_unittest_suites'] = ALL_UNITTESTS[:]
+BRANCHES['cedar']['platforms']['b2g_emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = ALL_UNITTESTS[:]
+BRANCHES['cedar']['platforms']['b2g_emulator']['enable_debug_unittests'] = True
+BRANCHES['cypress']['branch_name'] = "Cypress"
+BRANCHES['cypress']['repo_path'] = "projects/cypress"
+BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
+BRANCHES['graphics']['repo_path'] = "projects/graphics"
+BRANCHES['ionmonkey']['repo_path'] = "projects/ionmonkey"
+BRANCHES['mozilla-b2g18']['repo_path'] = "releases/mozilla-b2g18"
+BRANCHES['mozilla-b2g18']['platforms']['ics_armv7a_gecko']['fedora-b2g']['opt_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in REFTEST] + REFTEST_SANITY
+BRANCHES['mozilla-b2g18']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = MOCHITEST + XPCSHELL
+BRANCHES['mozilla-b2g18']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
+BRANCHES['mozilla-b2g18_v1_0_1']['repo_path'] = "releases/mozilla-b2g18_v1_0_1"
+BRANCHES['mozilla-b2g18_v1_0_1']['platforms']['ics_armv7a_gecko']['fedora-b2g']['opt_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in CRASHTEST + REFTEST] + REFTEST_SANITY
+BRANCHES['mozilla-b2g18_v1_0_1']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = MOCHITEST + XPCSHELL
+BRANCHES['mozilla-b2g18_v1_0_1']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
+BRANCHES['mozilla-b2g18_v1_1_0_hd']['repo_path'] = "releases/mozilla-b2g18_v1_1_0_hd"
+BRANCHES['mozilla-b2g18_v1_1_0_hd']['platforms']['ics_armv7a_gecko']['fedora-b2g']['opt_unittest_suites'] = [x for x in ALL_UNITTESTS if x not in REFTEST] + REFTEST_SANITY
+BRANCHES['mozilla-b2g18_v1_1_0_hd']['platforms']['ics_armv7a_gecko']['fedora-b2g']['debug_unittest_suites'] = MOCHITEST + XPCSHELL
+BRANCHES['mozilla-b2g18_v1_1_0_hd']['platforms']['ics_armv7a_gecko']['enable_debug_unittests'] = True
+BRANCHES['mozilla-central']['branch_name'] = "Firefox"
+BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
+BRANCHES['services-central']['repo_path'] = "services/services-central"
+BRANCHES['try']['pgo_strategy'] = "try"
+BRANCHES['try']['enable_try'] = True
+
+# explicitly set slave platforms per branch
+for branch in BRANCHES.keys():
+    for platform in BRANCHES[branch]['platforms']:
+        if 'slave_platforms' not in BRANCHES[branch]['platforms'][platform]:
+            BRANCHES[branch]['platforms'][platform]['slave_platforms'] = list(PLATFORMS[platform]['slave_platforms'])
+
+# MERGE DAY NOTE: remove v22 based branches from the list below
+NON_UBUNTU_BRANCHES = ("mozilla-b2g18", "mozilla-b2g18_v1_0_1", "mozilla-b2g18_v1_1_0_hd")
+
+# use either Fedora or Ubuntu for other branches,
+# don't touch cedar
+for branch in set(BRANCHES.keys()) - set(['cedar']):
+    if branch in NON_UBUNTU_BRANCHES:
+        # Remove Ubuntu completely
+        for platform in BRANCHES[branch]['platforms']:
+            if 'ubuntu64_vm-b2g' in BRANCHES[branch]['platforms'][platform]['slave_platforms']:
+                BRANCHES[branch]['platforms'][platform]['slave_platforms'].remove('ubuntu64_vm-b2g')
+            if 'ubuntu64_vm-b2g' in BRANCHES[branch]['platforms'][platform]:
+                del BRANCHES[branch]['platforms'][platform]['ubuntu64_vm-b2g']
+        continue
+
+    for suite_type in ('opt_unittest_suites', 'debug_unittest_suites'):
+        if nested_haskey(BRANCHES[branch]['platforms'], 'ics_armv7a_gecko',
+                         'ubuntu64_vm-b2g', suite_type) and \
+           nested_haskey(BRANCHES[branch]['platforms'], 'ics_armv7a_gecko',
+                         'fedora-b2g', suite_type):
+            # Don't run tests on Fedora if they listed in Ubuntu
+            for suite in BRANCHES[branch]['platforms']['ics_armv7a_gecko']['ubuntu64_vm-b2g'][suite_type]:
+                BRANCHES[branch]['platforms']['ics_armv7a_gecko']['fedora-b2g'][suite_type] = \
+                    [s for s in deepcopy(BRANCHES[branch]['platforms']['ics_armv7a_gecko']['fedora-b2g'][suite_type]) if s[0] != suite[0]]
+
+# Disable ubuntu64_hw-b2g on all branches but cedar
+for branch in set(BRANCHES.keys()) - set(['cedar']):
+    for platform in BRANCHES[branch]['platforms']:
+        if 'ubuntu64_hw-b2g' in BRANCHES[branch]['platforms'][platform]['slave_platforms']:
+            BRANCHES[branch]['platforms'][platform]['slave_platforms'].remove('ubuntu64_hw-b2g')
+        if 'ubuntu64_hw-b2g' in BRANCHES[branch]['platforms'][platform]:
+            del BRANCHES[branch]['platforms'][platform]['ubuntu64_hw-b2g']
+
+# Disable linux{32,64}_gecko, b2g_emulator on all branches but cedar
+for branch in set(BRANCHES.keys()) - set(['cedar']):
+    for platform in ('linux32_gecko', 'linux64_gecko', 'b2g_emulator'):
+        if platform not in BRANCHES[branch]['platforms']:
+            continue
+        del BRANCHES[branch]['platforms'][platform]
+
+
+if __name__ == "__main__":
+    import sys
+    import pprint
+
+    args = sys.argv[1:]
+
+    if len(args) > 0:
+        items = dict([(b, BRANCHES[b]) for b in args])
+    else:
+        items = dict(BRANCHES.items())
+
+    for k, v in sorted(items.iteritems()):
+        out = pprint.pformat(v)
+        for l in out.splitlines():
+            print '%s: %s' % (k, l)
+
+    for suite in sorted(SUITES):
+        out = pprint.pformat(SUITES[suite])
+        for l in out.splitlines():
+            print '%s: %s' % (suite, l)
new file mode 100644
--- /dev/null
+++ b/mozilla-tests/b2g_preproduction_config.py
@@ -0,0 +1,25 @@
+from copy import deepcopy
+
+from preproduction_config import GLOBAL_VARS, SLAVES, TRY_SLAVES
+
+GLOBAL_VARS = deepcopy(GLOBAL_VARS)
+
+GLOBAL_VARS['disable_tinderbox_mail'] = True
+GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
+GLOBAL_VARS['stage_username'] = 'ffxbld'
+GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_dsa'
+
+BRANCHES = {
+    'try': {
+        'enable_mail_notifier': False, # Set to True when testing
+        'email_override': [], # Set to your address when testing
+        'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/b2g/try-builds',
+        'package_dir': '%(who)s-%(got_revision)s',
+        'stage_username': 'trybld',
+        'stage_ssh_key': 'trybld_dsa',
+    },
+}
+
+PLATFORM_VARS = {}
+
+PROJECTS = {}
new file mode 100644
--- /dev/null
+++ b/mozilla-tests/b2g_production_config.py
@@ -0,0 +1,30 @@
+from copy import deepcopy
+
+from production_config import \
+    GLOBAL_VARS, SLAVES, TRY_SLAVES, GRAPH_CONFIG
+
+
+GLOBAL_VARS = deepcopy(GLOBAL_VARS)
+
+GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
+GLOBAL_VARS['disable_tinderbox_mail'] = True
+GLOBAL_VARS['stage_username'] = 'ffxbld'
+GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_dsa'
+
+# Local branch overrides
+BRANCHES = {
+    'try': {
+        'enable_mail_notifier': True,
+        'notify_real_author': True,
+        'enable_merging': False,
+        'slave_key': 'try_slaves',
+        'package_url': 'http://ftp.mozilla.org/pub/mozilla.org/b2g/try-builds',
+        'package_dir': '%(who)s-%(got_revision)s',
+        'stage_username': 'trybld',
+        'stage_ssh_key': 'trybld_dsa',
+    },
+}
+
+PLATFORM_VARS = {}
+
+PROJECTS = {}
new file mode 100644
--- /dev/null
+++ b/mozilla-tests/b2g_staging_config.py
@@ -0,0 +1,26 @@
+from copy import deepcopy
+
+from staging_config import GLOBAL_VARS, SLAVES, TRY_SLAVES
+
+GLOBAL_VARS = deepcopy(GLOBAL_VARS)
+
+GLOBAL_VARS['disable_tinderbox_mail'] = True
+GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
+GLOBAL_VARS['stage_username'] = 'ffxbld'
+GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_dsa'
+
+BRANCHES = {
+    'try': {
+        'enable_mail_notifier': False, # Set to True when testing
+        'email_override': [], # Set to your address when testing
+        'package_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/b2g/try-builds',
+        'package_dir': '%(who)s-%(got_revision)s',
+        'stage_username': 'trybld',
+        'stage_ssh_key': 'trybld_dsa',
+    },
+}
+
+PLATFORM_VARS = {}
+
+PROJECTS = {}
+
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1,940 +1,1085 @@
 from copy import deepcopy
 
-from buildbot.steps.shell import WithProperties
+import config_common
+reload(config_common)
+from config_common import TALOS_CMD, loadDefaultValues, loadCustomTalosSuites, \
+    loadTalosSuites, nested_haskey, get_talos_slave_platforms
 
 import project_branches
 reload(project_branches)
 from project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
 
 import localconfig
 reload(localconfig)
 from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS, GRAPH_CONFIG
 
-REMOTE_PROCESS_NAMES = { 'default':         'org.mozilla.fennec',
-                         'mozilla-beta':    'org.mozilla.firefox_beta',
-                         'mozilla-aurora':  'org.mozilla.fennec_aurora',
-                         'mozilla-release': 'org.mozilla.firefox',
-                         'mozilla-esr10':   'org.mozilla.firefox',
-                       }
-
-MOZHARNESS_REPO = "http://hg.mozilla.org/build/mozharness"
-
-TALOS_CMD = ['python', 'run_tests.py', '--noisy', WithProperties('%(configFile)s')]
-
-TALOS_ADDON_CMD = ['python', 'run_tests.py', '--noisy', '--amo', WithProperties('%(configFile)s')]
+MOZHARNESS_REBOOT_CMD = ['scripts/external_tools/count_and_reboot.py',
+                         '-f', '../reboot_count.txt',
+                         '-n', '1', '-z']
 
 TALOS_DIRTY_OPTS = {'talosAddOns': ['profiles/dirtyDBs.zip', 'profiles/dirtyMaxDBs.zip']}
 
-TALOS_TP_OPTS = {'plugins': {'32':'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp5.zip']}
-TALOS_TP4_OPTS = {'plugins': {'32':'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp4.zip']}
-
-TALOS_ADDON_OPTS = {'addonTester' : True, 'releaseTester' : True}
-TALOS_BASELINE_ADDON_OPTS = {'releaseTester' : True}
-
-TALOS_REMOTE_FENNEC_OPTS = { 'productName':  'fennec',
-                             'remoteTests':  True,
-                             'remoteExtras': { 'options': [ '--sampleConfig', 'remote.config',
-                                                            '--output', 'local.yml',
-                                                            '--webServer', 'bm-remote.build.mozilla.org',
-                                                            '--browserWait', '60',
-                                                          ],
-                                               'processName': REMOTE_PROCESS_NAMES,
-                                             },
-                           }
-
-UNITTEST_REMOTE_EXTRAS = { 'processName': REMOTE_PROCESS_NAMES,
-                         }
-ANDROID_UNITTEST_REMOTE_EXTRAS = deepcopy(UNITTEST_REMOTE_EXTRAS)
-ANDROID_UNITTEST_REMOTE_EXTRAS['cmdOptions'] = ['--bootstrap']
+TALOS_TP_OPTS = {'plugins': {'32': 'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp5.zip']}
+TALOS_TP_NEW_OPTS = {'plugins': {'32': 'zips/flash32_10_3_183_5.zip', '64': 'zips/flash64_11_0_d1_98.zip'}, 'pagesets': ['zips/tp5n.zip']}
 
 BRANCHES = {
     'mozilla-central':     {},
-    'mozilla-release':     { 'release_branch': True },
-    'mozilla-beta':        { 'release_branch': True },
     'mozilla-aurora':      {},
-    'mozilla-esr10':       { 'release_branch': True },
-    'mozilla-1.9.2':       { 'release_branch': True },
-    'shadow-central':      {},
-    'try':                 { 'coallesce_jobs': False},
-    'addontester':         {},
-    'addonbaselinetester': {},
+    'mozilla-release':     {},
+    'mozilla-beta':        {},
+    'mozilla-esr17':       {
+        'datazilla_url': None,
+        'platforms': {
+            'macosx64': {},
+            'win32': {},
+            'linux': {},
+            'linux64': {},
+        },
+        'lock_platforms': True,
+    },
+    'mozilla-b2g18': {
+        'datazilla_url': None,
+        'platforms': {
+            # desktop per sicking in Bug 829513
+            'macosx64': {},
+            'win32': {},
+            'linux': {},
+            'linux64': {},
+        },
+        'lock_platforms': True,
+    },
+    'mozilla-b2g18_v1_0_1': {
+        'datazilla_url': None,
+        'platforms': {
+            # desktop per sicking in Bug 829513
+            'macosx64': {},
+            'win32': {},
+            'linux': {},
+            'linux64': {},
+        },
+        'lock_platforms': True,
+    },
+    'mozilla-b2g18_v1_1_0_hd': {
+        'datazilla_url': None,
+        'platforms': {
+            # desktop per sicking in Bug 829513
+            'macosx64': {},
+            'win32': {},
+            'linux': {},
+            'linux64': {},
+        },
+        'lock_platforms': True,
+    },
+    'try': {'coallesce_jobs': False},
 }
 
 # Talos
 PLATFORMS = {
-    'macosx': {},
     'macosx64': {},
     'win32': {},
-    'win64': {},
     'linux': {},
-    'linux64' : {},
-    'android': {},
-    'android-xul': {},
-    'linux-android': {},
+    'linux64': {},
 }
 
-# work around path length problem bug 599795
-# leopard-o == leopard-old
-PLATFORMS['macosx']['slave_platforms'] = ['leopard-o']
-PLATFORMS['macosx']['env_name'] = 'mac-perf'
-PLATFORMS['macosx']['leopard-o'] = {'name': "Rev3 MacOSX Leopard 10.5.8"}
-PLATFORMS['macosx']['stage_product'] = 'firefox'
-PLATFORMS['macosx']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-PLATFORMS['macosx64']['slave_platforms'] = ['leopard', 'snowleopard',
-                                            'lion']
+PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
 PLATFORMS['macosx64']['env_name'] = 'mac-perf'
-PLATFORMS['macosx64']['leopard'] = {'name': "Rev3 MacOSX Leopard 10.5.8"}
 PLATFORMS['macosx64']['snowleopard'] = {'name': "Rev4 MacOSX Snow Leopard 10.6"}
 PLATFORMS['macosx64']['lion'] = {'name': "Rev4 MacOSX Lion 10.7"}
+PLATFORMS['macosx64']['mountainlion'] = {'name': "Rev5 MacOSX Mountain Lion 10.8"}
 PLATFORMS['macosx64']['stage_product'] = 'firefox'
-PLATFORMS['macosx64']['mozharness_python'] = '/tools/buildbot/bin/python'
+PLATFORMS['macosx64']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
 
-PLATFORMS['win32']['slave_platforms'] = ['xp', 'win7']
+PLATFORMS['win32']['slave_platforms'] = ['xp', 'xp-ix', 'win7', 'win7-ix', 'win8']
+PLATFORMS['win32']['talos_slave_platforms'] = ['xp', 'xp-ix', 'win7', 'win7-ix', 'win8']
 PLATFORMS['win32']['env_name'] = 'win32-perf'
 PLATFORMS['win32']['xp'] = {'name': "Rev3 WINNT 5.1"}
+PLATFORMS['win32']['xp-ix'] = {'name': "Windows XP 32-bit"}
 PLATFORMS['win32']['win7'] = {'name': "Rev3 WINNT 6.1"}
+PLATFORMS['win32']['win7-ix'] = {'name': "Windows 7 32-bit"}
+PLATFORMS['win32']['win8'] = {'name': "WINNT 6.2"}
 PLATFORMS['win32']['stage_product'] = 'firefox'
-PLATFORMS['win32']['mozharness_python'] = ['c:/mozilla-build/python25/python', '-u']
+PLATFORMS['win32']['mozharness_config'] = {
+    'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
+    'hg_bin': 'c:\\mozilla-build\\hg\\hg',
+    'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
+}
 
-PLATFORMS['win64']['slave_platforms'] = ['w764']
-PLATFORMS['win64']['env_name'] = 'win64-perf'
-PLATFORMS['win64']['w764'] = {'name': "Rev3 WINNT 6.1 x64",
-                              'download_symbols': False,
-                             }
-PLATFORMS['win64']['stage_product'] = 'firefox'
-PLATFORMS['win64']['mozharness_python'] = ['c:/mozilla-build/python25/python', '-u']
-
-PLATFORMS['linux']['slave_platforms'] = ['fedora']
+PLATFORMS['linux']['slave_platforms'] = ['fedora', 'ubuntu32_vm']
+PLATFORMS['linux']['talos_slave_platforms'] = ['fedora', 'ubuntu32_hw']
 PLATFORMS['linux']['env_name'] = 'linux-perf'
 PLATFORMS['linux']['fedora'] = {'name': "Rev3 Fedora 12"}
+PLATFORMS['linux']['ubuntu32_vm'] = {'name': 'Ubuntu VM 12.04'}
+PLATFORMS['linux']['ubuntu32_hw'] = {'name': 'Ubuntu HW 12.04'}
 PLATFORMS['linux']['stage_product'] = 'firefox'
-PLATFORMS['linux']['mozharness_python'] = '/tools/buildbot/bin/python'
+PLATFORMS['linux']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
 
-PLATFORMS['linux64']['slave_platforms'] = ['fedora64']
+PLATFORMS['linux64']['slave_platforms'] = ['fedora64', 'ubuntu64_vm']
+PLATFORMS['linux64']['talos_slave_platforms'] = ['fedora64', 'ubuntu64_hw']
 PLATFORMS['linux64']['env_name'] = 'linux-perf'
 PLATFORMS['linux64']['fedora64'] = {'name': "Rev3 Fedora 12x64"}
+PLATFORMS['linux64']['ubuntu64_vm'] = {'name': 'Ubuntu VM 12.04 x64'}
+PLATFORMS['linux64']['ubuntu64_hw'] = {'name': 'Ubuntu HW 12.04 x64'}
 PLATFORMS['linux64']['stage_product'] = 'firefox'
-PLATFORMS['linux64']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-PLATFORMS['linux-android']['slave_platforms'] = ['tegra_android-o']
-PLATFORMS['linux-android']['env_name'] = 'android-perf'
-PLATFORMS['linux-android']['is_mobile'] = True
-PLATFORMS['linux-android']['tegra_android-o'] = {'name': "Android Tegra 250"}
-PLATFORMS['linux-android']['stage_platform'] = 'android'
-PLATFORMS['linux-android']['stage_product'] = 'mobile'
-PLATFORMS['linux-android']['mozharness_python'] = '/tools/buildbot/bin/python'
+PLATFORMS['linux64']['mozharness_config'] = {
+    'mozharness_python': '/tools/buildbot/bin/python',
+    'hg_bin': 'hg',
+    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
+}
 
-PLATFORMS['android']['slave_platforms'] = ['tegra_android']
-PLATFORMS['android']['env_name'] = 'android-perf'
-PLATFORMS['android']['is_mobile'] = True
-PLATFORMS['android']['tegra_android'] = {'name': "Android Tegra 250"}
-PLATFORMS['android']['stage_product'] = 'mobile'
-PLATFORMS['android']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-PLATFORMS['android-xul']['slave_platforms'] = ['tegra_android-xul']
-PLATFORMS['android-xul']['env_name'] = 'android-perf'
-PLATFORMS['android-xul']['is_mobile'] = True
-PLATFORMS['android-xul']['tegra_android-xul'] = {'name': "Android XUL Tegra 250"}
-PLATFORMS['android-xul']['stage_product'] = 'mobile'
-PLATFORMS['android-xul']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-# Lets be explicit instead of magical.  leopard-o should be a second
-# entry in the SLAVE dict
+# Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.items():
-    for slave_platform in platform_config['slave_platforms']:
+    all_slave_platforms = set(platform_config['slave_platforms'] +
+                              platform_config.get('talos_slave_platforms', []))
+    for slave_platform in all_slave_platforms:
         platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
         if slave_platform in TRY_SLAVES:
             platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
-MOBILE_PLATFORMS = PLATFORMS['android']['slave_platforms'] + \
-                   PLATFORMS['android-xul']['slave_platforms'] + \
-                   PLATFORMS['linux-android']['slave_platforms']
 
-ALL_PLATFORMS = PLATFORMS['linux']['slave_platforms'] + \
-                PLATFORMS['linux64']['slave_platforms'] + \
-                PLATFORMS['win32']['slave_platforms'] + \
-                PLATFORMS['macosx64']['slave_platforms']
-
-WIN7_ONLY = ['win7']
-
-NO_WIN = PLATFORMS['macosx64']['slave_platforms'] + PLATFORMS['linux']['slave_platforms'] + PLATFORMS['linux64']['slave_platforms']
-
-NO_MAC = PLATFORMS['linux']['slave_platforms'] + \
-         PLATFORMS['linux64']['slave_platforms'] + \
-         PLATFORMS['win32']['slave_platforms']
-
-MAC_ONLY = PLATFORMS['macosx64']['slave_platforms']
-
-ANDROID = PLATFORMS['android']['slave_platforms'] + \
-          PLATFORMS['android-xul']['slave_platforms'] + \
-          PLATFORMS['linux-android']['slave_platforms']
-
-ANDROID_NATIVE = PLATFORMS['android']['slave_platforms']
-
-ANDROID_XUL = PLATFORMS['android-xul']['slave_platforms'] + \
-              PLATFORMS['linux-android']['slave_platforms']
-
-ADDON_TESTER_PLATFORMS = ['win7', 'fedora', 'snowleopard']
+ALL_TALOS_PLATFORMS = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'win32', 'macosx64'))
+NO_WIN = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'macosx64'))
+NO_WINXP = [platform for platform in ALL_TALOS_PLATFORMS if platform != 'xp' and platform != 'xp-ix']
+NO_MAC = get_talos_slave_platforms(PLATFORMS, platforms=('linux', 'linux64', 'win32'))
+MAC_ONLY = get_talos_slave_platforms(PLATFORMS, platforms=('macosx64',))
+WIN7_ONLY = ['win7-ix']
 
 SUITES = {
-    'chrome': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll:a11y:ts_paint:tpaint:tdhtml:tsspider', '--mozAfterPaint'],
-        'options': ({}, NO_MAC),
-    },
-    # chrome_mac compared to chrome is that it does not contain a11y and only run on Mac
-    'chrome_mac': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll:ts_paint:tpaint:tdhtml:tsspider', '--mozAfterPaint'],
-        'options': ({}, MAC_ONLY),
-    },
-    'nochrome': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tdhtml:tsspider', '--noChrome', '--mozAfterPaint'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    'dirty': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'ts_places_generated_med:ts_places_generated_max', '--setPref', 'hangmonitor.timeout=0'],
-        'options': (TALOS_DIRTY_OPTS, ALL_PLATFORMS),
-    },
-    'tp': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5', '--mozAfterPaint'],
-        'options': (TALOS_TP_OPTS, ALL_PLATFORMS),
-    },
-    'tp4': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp4'],
-        'options': (TALOS_TP4_OPTS, ALL_PLATFORMS),
-    },
-    'cold': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'ts_cold:ts_cold_generated_min:ts_cold_generated_med:ts_cold_generated_max'],
-        'options': (TALOS_DIRTY_OPTS, NO_WIN),
-    },
-    'v8': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'v8'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    'svg': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tsvg:tsvg_opacity'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    'dromaeo': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_basics:dromaeo_v8:dromaeo_sunspider:dromaeo_jslib:dromaeo_css:dromaeo_dom'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    # New set of test that report numbers differently (https://wiki.mozilla.org/Auto-tools/Projects/Signal_From_Noise)
-    # tp5 -> tpr instead of tp5.2.  This is osx only and we will consider switching linux and windows ot this as well.
-    # all these tests should be default on m-c/m-i/m-a and project branches.  Off for beta/release/1.9.2
-    'tpr_responsiveness': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5r', '--mozAfterPaint', '--responsiveness', '--ignoreFirst', '--sampleConfig', 'sample.2.config'],
-        'options': (TALOS_TP_OPTS, ALL_PLATFORMS),
-    },
-    'v8.2': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'v8.2', '--ignoreFirst', '--sampleConfig', 'sample.2.config'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    'chrome.2': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll.2:a11y.2:ts_paint:tpaint:tdhtml.2:tsspider.2', '--mozAfterPaint', '--ignoreFirst', '--sampleConfig', 'sample.2.config'],
-        'options': ({}, NO_MAC),
-    },
-    # chrome_mac compared to chrome is that it does not contain a11y and only run on Mac
-    'chrome_mac.2': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll.2:ts_paint:tpaint:tdhtml.2:tsspider.2', '--mozAfterPaint', '--ignoreFirst', '--sampleConfig', 'sample.2.config'],
-        'options': ({}, MAC_ONLY),
-    },
-    'nochrome.2': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tdhtml.2:tsspider.2', '--noChrome', '--mozAfterPaint', '--ignoreFirst', '--sampleConfig', 'sample.2.config'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    # Special case talos tests
-    'addon': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown', '--sampleConfig', 'addon.config'],
-        'options': (TALOS_ADDON_OPTS, ALL_PLATFORMS),
-    },
-    'addon-baseline': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'ts', '--noShutdown', '--sampleConfig', 'addon.config'],
-        'options': (TALOS_BASELINE_ADDON_OPTS, ALL_PLATFORMS),
-    },
     'xperf': {
         'enable_by_default': False,
-        'suites': ['--activeTests', 'ts_paint:tpaint', '--sampleConfig', 'xperf.config', '--setPref', 'dom.send_after_paint_to_content=true', '--xperf_path', '"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"'],
-        'options': ({}, WIN7_ONLY),
-    },
-    # Mobile specific talos tests
-    'remote-ts': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'ts', '--noChrome'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
-    },
-    'remote-tdhtml': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tdhtml', '--noChrome'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
-    },
-    'remote-tsvg': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tsvg', '--noChrome'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5n', '--sampleConfig', 'xperf.config', '--mozAfterPaint', '--xperf_path', '"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe"', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': (TALOS_TP_NEW_OPTS, WIN7_ONLY),
     },
-    'remote-tsspider': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tsspider', '--noChrome'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
-    },
-    'remote-tpan': {
+    'tpn': {
         'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tpan', '--noChrome'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID_XUL),
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5n', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
     },
-    'remote-trobocop': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'trobopan', '--noChrome', '--fennecIDs', '../fennec_ids.txt'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID_NATIVE),
+    'tp5o': {
+        'enable_by_default': True,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5o', '--mozAfterPaint', '--responsiveness', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': (TALOS_TP_NEW_OPTS, ALL_TALOS_PLATFORMS),
     },
-    'remote-trobocheck': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'trobocheck', '--noChrome', '--fennecIDs', '../fennec_ids.txt'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID_NATIVE),
-    },
-    'remote-tp4m': {
+    'other': {
         'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp4m', '--rss'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID_XUL),
-    },
-    'remote-tp4m_nochrome': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp4m', '--noChrome', '--rss'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tscrollr:a11yr:ts_paint:tpaint', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
-    'remote-twinopen': {
+    'svgr': {
         'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'twinopen'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID),
-    },
-    'remote-tzoom': {
-        'enable_by_default': True,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tzoom'],
-        'options': (TALOS_REMOTE_FENNEC_OPTS, ANDROID_XUL),
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tsvgr:tsvgr_opacity', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
-    # These old suites are only for 1.9.2 and do not use --mozAfterPaint 
-    # chrome VS old_chrome is:
-    # 1) without --mozAfterPaint, 2) use ts instead tpaint and 3) use twinopen instead of tpaint
-    'old_chrome': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll:a11y:ts:tdhtml:twinopen:tsspider'],
-        'options': ({}, NO_MAC),
+    'dirtypaint': {
+        'enable_by_default': True,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tspaint_places_generated_med:tspaint_places_generated_max', '--setPref', 'hangmonitor.timeout=0', '--mozAfterPaint'],
+        'options': (TALOS_DIRTY_OPTS, ALL_TALOS_PLATFORMS),
     },
-    'old_chrome_mac': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tscroll:ts:tdhtml:twinopen:tsspider'],
-        'options': ({}, MAC_ONLY),
+    'dromaeojs': {
+        'enable_by_default': True,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'dromaeo_css:dromaeo_dom:kraken:v8_7'],
+        'options': ({}, NO_WINXP),
     },
-    'old_nochrome': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tdhtml:tsspider', '--noChrome'],
-        'options': ({}, ALL_PLATFORMS),
-    },
-    'old_tp': {
-        'enable_by_default': False,
-        'suites': GRAPH_CONFIG + ['--activeTests', 'tp5'],
-        'options': (TALOS_TP_OPTS, ALL_PLATFORMS),
+    'chromez': {
+        'enable_by_default': True,
+        'suites': GRAPH_CONFIG + ['--activeTests', 'tresize', '--mozAfterPaint', '--filter', 'ignore_first:5', '--filter', 'median'],
+        'options': ({}, ALL_TALOS_PLATFORMS),
     },
 }
 
-# these three are for mozilla-1.9.2
-OLD_BRANCH_ALL_PLATFORMS = PLATFORMS['linux']['slave_platforms'] + \
-                PLATFORMS['win32']['slave_platforms'] + \
-                PLATFORMS['macosx']['slave_platforms']
-
-OLD_BRANCH_NO_WIN = PLATFORMS['macosx']['slave_platforms'] + PLATFORMS['linux']['slave_platforms']
-
-OLD_BRANCH_NO_MAC = PLATFORMS['linux']['slave_platforms'] + PLATFORMS['win32']['slave_platforms']
-
-OLD_BRANCH_MAC_ONLY = PLATFORMS['macosx']['slave_platforms'] 
-
-OLD_BRANCH_ADDON_TESTER_PLATFORMS = ['win7'] + ['fedora'] + ['snowleopard']
-
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
         'linux64': {},
-        'macosx': {},
         'macosx64': {},
         'win32': {},
-        'win64': {},
-        'android': {},
-        'android-xul': {},
-        'linux-android': {},
     },
 }
 
-# Default set of unit tests
-UNITTEST_SUITES = {
-    'opt_unittest_suites': [
-        # Turn on chunks for mochitests
-        ('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
-        ('mochitest-other', ['mochitest-chrome', 'mochitest-browser-chrome',
-                             'mochitest-a11y', 'mochitest-ipcplugins']),
+# MERGE DAY remove this chunk when Firefox 22 is on all branches.
+# Buildbot-based unit tests.
+BUILDBOT_UNITTEST_SUITES = {
+    'opt': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-a11y', 'mochitest-ipcplugins']),
         ('reftest', ['reftest']),
         ('crashtest', ['crashtest']),
         ('xpcshell', ['xpcshell']),
         ('jsreftest', ['jsreftest']),
         # Disabled in bug 630551
         #('mozmill-all', ['mozmill']),
     ],
-    'debug_unittest_suites': [
-        # Turn on chunks for mochitests
-        ('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
-        ('mochitest-other', ['mochitest-chrome', 'mochitest-browser-chrome',
-                             'mochitest-a11y', 'mochitest-ipcplugins']),
+    'opt_with_ipc': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-a11y', 'mochitest-ipcplugins']),
+        ('reftest', ['reftest']),
+        ('crashtest', ['crashtest']),
+        ('xpcshell', ['xpcshell']),
+        ('jsreftest', ['jsreftest']),
+        # Disabled in bug 630551
+        #('mozmill-all', ['mozmill']),
+        ('reftest-ipc', ['reftest-ipc']),
+        ('reftest-no-accel', ['opengl-no-accel']),
+        ('crashtest-ipc', ['crashtest-ipc'])
+    ],
+    'opt_with_no-d2d-d3d': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-a11y', 'mochitest-ipcplugins']),
+        ('reftest', ['reftest']),
+        ('crashtest', ['crashtest']),
+        ('xpcshell', ['xpcshell']),
+        ('jsreftest', ['jsreftest']),
+        # Disabled in bug 630551
+        #('mozmill-all', ['mozmill']),
+        ('reftest-no-accel', ['reftest-no-d2d-d3d']),
+    ],
+    'opt_no_a11y': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-ipcplugins']),
+        ('reftest', ['reftest']),
+        ('crashtest', ['crashtest']),
+        ('xpcshell', ['xpcshell']),
+        ('jsreftest', ['jsreftest']),
+        # Disabled in bug 630551
+        #('mozmill-all', ['mozmill']),
+    ],
+    'debug': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-a11y', 'mochitest-ipcplugins']),
+        ('reftest', ['reftest']),
+        ('crashtest', ['crashtest']),
+        ('xpcshell', ['xpcshell']),
+        ('jsreftest', ['jsreftest']),
+        # Disabled in bug 630551
+        #('mozmill-all', ['mozmill']),
+    ],
+    'debug_no_a11y': [
+        # Turn on chunks for mochitest
+        ('mochitest', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
+        ('mochitest-browser-chrome', ['mochitest-browser-chrome']),
+        ('mochitest-other', ['mochitest-chrome', 'mochitest-ipcplugins']),
         ('reftest', ['reftest']),
         ('crashtest', ['crashtest']),
         ('xpcshell', ['xpcshell']),
         ('jsreftest', ['jsreftest']),
         # Disabled in bug 630551
         #('mozmill-all', ['mozmill']),
     ],
-    'mobile_unittest_suites': [
-        # The disabled test suites are only disabled until we can get
-        # to 100% green
-        #('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
-        #('mochitest-other', ['mochitest-chrome', 'mochitest-a11y',
-        #                     'mochitest-ipcplugins']),
-        ('mobile-mochitest-browser-chrome', ['mobile-mochitest-browser-chrome']),
-        #('reftest', ['reftest']),
-        #('crashtest', ['crashtest']),
-        #('xpcshell', ['xpcshell']),
-        #('jsreftest', ['jsreftest']),
-    ],
+}
+# End MERGE DAY
+
+MOCHITEST = [
+    ('mochitest-1', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'plain1'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-2', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'plain2'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-3', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'plain3'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-4', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'plain4'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-5', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'plain5'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-browser-chrome', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'browser-chrome'],
+        'script_maxtime': 7200,
+    }),
+    ('mochitest-other', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'chrome,a11y,plugins'],
+        'script_maxtime': 7200,
+    }),
+]
+
+REFTEST_NO_IPC = [
+    ('reftest', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'reftest'],
+        'script_maxtime': 7200,
+    }),
+    ('jsreftest', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'jsreftest'],
+        'script_maxtime': 7200,
+    }),
+    ('crashtest', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'crashtest'],
+        'script_maxtime': 7200,
+    }),
+]
+REFTEST_NOACCEL = [
+    ('reftest-no-accel', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'reftest-no-accel'],
+        'script_maxtime': 7200,
+    }),
+]
+REFTEST_IPC = [
+    ('reftest-ipc', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'reftest-ipc'],
+        'script_maxtime': 7200,
+    }),
+    ('crashtest-ipc', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--reftest-suite', 'crashtest-ipc'],
+        'script_maxtime': 7200,
+    }),
+]
+
+XPCSHELL = [
+    ('xpcshell', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--xpcshell-suite', 'xpcshell'],
+        'script_maxtime': 7200,
+    }),
+]
+MARIONETTE = [
+    ('marionette', {
+        'use_mozharness': True,
+        'script_path': 'scripts/marionette.py',
+        'download_symbols': False,
+    }),
+]
+METRO = [
+    ('mochitest-metro-chrome', {
+        'use_mozharness': True,
+        'script_path': 'scripts/desktop_unittest.py',
+        'extra_args': ['--mochitest-suite', 'mochitest-metro-chrome'],
+        'script_maxtime': 7200,
+    }),
+]
+
+UNITTEST_SUITES = {
+    'opt_unittest_suites': MOCHITEST + REFTEST_NO_IPC + XPCSHELL,
+    'debug_unittest_suites': MOCHITEST + REFTEST_NO_IPC + XPCSHELL + MARIONETTE,
 }
 
-def removeSuite(suiteName, suiteList):
-    '''It removes 'suite' from 'suiteList' and returns it.
 
-    Keyword arguments:
-    suiteName -- it is the name of the suite that we want to remove
-    suiteList -- it is the list of suites from where we want to remove
-                 suiteList is a list of tuples. The tuples is formed
-                 of a string and a list of suites.
-    '''
-    # Let's iterate over each tuple
-    for i, info in enumerate(suiteList):
-        name, suites = info
-        # Let's see if suiteName is on this list of suites
-        if suiteName in suites:
-            suites = suites[:]
-            suites.remove(suiteName)
-            suiteList[i] = (name, suites)
-    return suiteList
-
-def addSuite(suiteGroupName, newSuiteName, suiteList):
-    # In UNITTEST_SUITES we have opt, debug and mobile unit tests keys.
-    # Each one of these have a list of tuples of test suites.
-    #     e.g. suiteGroup = ('reftest', ['reftest])
-    newSuiteList = []
-    added = False
-    for tuple in suiteList:
-        name, suites = tuple
-        if suiteGroupName == name:
-            suites.append(newSuiteName)
-            added = True
-        newSuiteList.append((name, suites))
-
-    if not added:
-        newSuiteList.append((name, suites))
-
-    return newSuiteList
-
-def loadDefaultValues(BRANCHES, branch, branchConfig):
-    BRANCHES[branch]['repo_path'] = branchConfig.get('repo_path', 'projects/' + branch) 
-    BRANCHES[branch]['branch_name'] = branchConfig.get('branch_name', branch.title())
-    BRANCHES[branch]['mobile_branch_name'] = branchConfig.get('mobile_branch_name', branch.title())
-    BRANCHES[branch]['build_branch'] = branchConfig.get('build_branch', branch.title())
-    BRANCHES[branch]['talos_command'] = branchConfig.get('talos_cmd', TALOS_CMD)
-    BRANCHES[branch]['fetch_symbols'] = branchConfig.get('fetch_symbols', True)
-    BRANCHES[branch]['talos_from_source_code'] = branchConfig.get('talos_from_source_code', True)
-    BRANCHES[branch]['support_url_base'] = branchConfig.get('support_url_base', 'http://build.mozilla.org/talos')
-    BRANCHES[branch]['enable_unittests'] = branchConfig.get('enable_unittests', True)
-    BRANCHES[branch]['pgo_strategy'] = branchConfig.get('pgo_strategy', None)
-
-def loadCustomTalosSuites(BRANCHES, SUITES, branch, branchConfig):
-    coallesceJobs = branchConfig.get('coallesce_jobs', True)
-    BRANCHES[branch]['suites'] = deepcopy(SUITES)
-    # Check if Talos is enabled, if False, set 0 runs for all suites
-    if branchConfig.get('enable_talos') == False:
-        branchConfig['talos_suites'] = {}
-        for suite in SUITES.keys():
-            branchConfig['talos_suites'][suite]  = 0
-
-    # Want to turn on/off a talos suite? Set it in the PROJECT_BRANCHES[branch]['talos_suites'] 
-    # This is the default and will make all talosConfig.get(key,0) calls
-    # to default to 0 a.k.a. disabled suite
-    talosConfig = {}
-    if branchConfig.get('talos_suites'):
-        for suite, settings in branchConfig['talos_suites'].items():
-            # Normally the setting is just 0 or 1 for talosConfig to enable/disable a test
-            # If there's a list, value[0] is the enabling flag and [1] is a dict of customization
-            if isinstance(settings, list):
-                talosConfig[suite] = settings[0]
-                # append anything new in 'suites' for a talos_suite
-                for key, value in settings[1].items():
-                    if suite in SUITES.keys():
-                        BRANCHES[branch]['suites'][suite][key] += value
-            else:
-                talosConfig[suite] = settings
-
-    for suite in SUITES.keys():
-        if not SUITES[suite]['enable_by_default']:
-            # Suites that are turned off by default
-            BRANCHES[branch][suite + '_tests'] = (talosConfig.get(suite, 0), coallesceJobs) + SUITES[suite]['options']
-        else:
-            # Suites that are turned on by default
-            BRANCHES[branch][suite + '_tests'] = (talosConfig.get(suite, 1), coallesceJobs) + SUITES[suite]['options']
-
-def loadTalosSuites(BRANCHES, SUITES, branch):
-    '''
-    This is very similar to loadCustomTalosSuites and is to deal with branches that are not in project_branches.py
-    but in config.py. Both functions could be unified later on when we do further refactoring.
-    '''
-    coallesceJobs = BRANCHES[branch].get('coallesce_jobs', True)
-    for suite in SUITES.keys():
-        if not SUITES[suite]['enable_by_default']:
-            # Suites that are turned off by default
-            BRANCHES[branch][suite + '_tests'] = (0, coallesceJobs) + SUITES[suite]['options']
-        else:
-            # Suites that are turned on by default
-            BRANCHES[branch][suite + '_tests'] = (1, coallesceJobs) + SUITES[suite]['options']
-
-def loadCustomUnittestSuites(BRANCHES, branch, branchConfig):
-    # If you want a project branch to have a different set of unit tests you can
-    # do the following:
-    #  - add a key called "add_test_suites"
-    #  - add a tuple for each test suite with the following format:
-    #      ('OS_nick', 'platform', 'opt|debug', 'new or existing group', 'suite name')
-    #      e.g. ('macosx64', 'snowleopard', 'debug', 'mochitest-other', 'a11y')
-    #
-    # Old way of adding suites but still the same format
-    #    BRANCHES['mozilla-central']['platforms']['win32']['win7']['debug_unittest_suites'] \
-    #        += [('jetpack', ['jetpack'])]
-    #
-    for suiteToAdd in branchConfig.get('add_test_suites', []):
-        type = 'opt_unittest_suites' if suiteToAdd[2] == 'opt' else 'debug_unittest_suites'
-        # 'debug_unittest_suites' or 'opt_unittest_suites' is a list of tuple
-        # addSuite() modifies that list and returns a new one with the added suite
-        BRANCHES[branch]['platforms'][suiteToAdd[0]][suiteToAdd[1]][type] = \
-            addSuite( suiteGroupName=suiteToAdd[3], newSuiteName=suiteToAdd[4],
-                      suiteList=BRANCHES[branch]['platforms'][suiteToAdd[0]][suiteToAdd[1]][type])
-
-ANDROID_XUL_UNITTEST_DICT = {
-    'opt_unittest_suites': [
-        ('mochitest-1', (
-            {'suite': 'mochitest-plain',
-             'testPaths': [
-                 'content/smil/test', 'content/xml/document/test',
-                 'content/xslt/tests/mochitest'
-             ]
-            },
-        )),
-        ('mochitest-2', (
-            {'suite': 'mochitest-plain',
-             'testPaths': [
-                 'dom/src/json/test', 'dom/src/jsurl/test',
-                 'dom/tests/mochitest/dom-level0', 'js'
-             ]
-            },
-        )),
-        ('mochitest-3', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['dom/tests/mochitest/dom-level1-core']
-            },
-        )),
-        ('mochitest-4', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['dom/tests/mochitest/dom-level2-core']
-            },
-        )),
-        ('mochitest-5', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['dom/tests/mochitest/ajax/mochikit',
-                           'dom/tests/mochitest/ajax/scriptaculous',
-                           'dom/tests/mochitest/ajax/jquery'],
-            },
-        )),
-        ('mochitest-6', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['dom/tests/mochitest/dom-level2-html'],
-            },
-        )),
-        ('mochitest-7', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['Harness_sanity',
-                           'editor/composer/test',
-                           'intl/uconv/tests',
-                           'dom/tests/mochitest/orientation',
-                           'dom/tests/mochitest/storageevent'],
-            },
-        )),
-        ('mochitest-8', (
-            {'suite': 'mochitest-plain',
-             'testPaths': ['layout/xul/test',
-                           'modules/libjar/test/mochitest',
-                           'layout/inspector/tests',
-                           'toolkit/xre/test',
-                           'toolkit/components/microformats/tests',
-                           'MochiKit-1.4.2/tests',
-                           'parser/htmlparser/tests/mochitest'],
-           },
-        )),
-        ('browser-chrome', (
-            {'suite': 'mochitest-browser-chrome',
-             'testPaths': ['mobile']
-            },
-        )),
-        ('reftest-1', (
-            {'suite': 'reftest',
-             'totalChunks': 3,
-             'thisChunk': 1,
-            },
-        )),
-        ('reftest-2', (
-            {'suite': 'reftest',
-             'totalChunks': 3,
-             'thisChunk': 2,
-            },
-        )),
-        ('reftest-3', (
-            {'suite': 'reftest',
-             'totalChunks': 3,
-             'thisChunk': 3,
-            },
-        )),
-        ('crashtest-1', (
-            {'suite': 'crashtest',
-             'totalChunks': 3,
-             'thisChunk': 1,
-            },
-        )),
-        ('crashtest-2', (
-            {'suite': 'crashtest',
-             'totalChunks': 3,
-             'thisChunk': 2,
-            },
-        )),
-        ('crashtest-3', (
-            {'suite': 'crashtest',
-             'totalChunks': 3,
-             'thisChunk': 3,
-            },
-        )),
-        ('jsreftest-1', (
-            {'suite': 'jsreftest',
-             'totalChunks': 3,
-             'thisChunk': 1,
-            },
-        )),
-        ('jsreftest-2', (
-            {'suite': 'jsreftest',
-             'totalChunks': 3,
-             'thisChunk': 2,
-            },
-        )),
-        ('jsreftest-3', (
-            {'suite': 'jsreftest',
-             'totalChunks': 3,
-             'thisChunk': 3,
-            },
-        )),
-    ],
-    'debug_unittest_suites': [],
-}
-ANDROID_UNITTEST_DICT = {
-    'opt_unittest_suites': [
-        ('mochitest-1', (