From 9ea43925ac65d065e9df40e510369301bf9d5aba Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Tue, 4 Sep 2012 16:01:25 -0700
Subject: [PATCH] Backed out changeset ceb6f653de08 (bug 738612)

---
 b2g/config/mozconfigs/gb_armv7a_gecko/debug       | 2 --
 b2g/config/mozconfigs/gb_armv7a_gecko/nightly     | 2 --
 b2g/config/mozconfigs/ics_armv7a_gecko/nightly    | 2 --
 b2g/config/mozconfigs/linux32_gecko/nightly       | 2 --
 b2g/config/mozconfigs/win32_gecko/nightly         | 2 --
 browser/config/mozconfigs/macosx32/debug          | 1 -
 browser/config/mozconfigs/macosx64/l10n-mozconfig | 2 --
 browser/config/mozconfigs/win32/debug             | 2 --
 browser/config/mozconfigs/win32/l10n-mozconfig    | 2 --
 browser/config/mozconfigs/win32/nightly           | 2 --
 browser/config/mozconfigs/win32/release           | 2 --
 11 files changed, 21 deletions(-)

diff --git a/b2g/config/mozconfigs/gb_armv7a_gecko/debug b/b2g/config/mozconfigs/gb_armv7a_gecko/debug
index 5cdc7a448082..5f14adf3c180 100644
--- a/b2g/config/mozconfigs/gb_armv7a_gecko/debug
+++ b/b2g/config/mozconfigs/gb_armv7a_gecko/debug
@@ -1,5 +1,3 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
 
 mk_add_options MOZ_MAKE_FLAGS="-j8"
diff --git a/b2g/config/mozconfigs/gb_armv7a_gecko/nightly b/b2g/config/mozconfigs/gb_armv7a_gecko/nightly
index 4bdd3cb6b8ea..31cd349250b2 100644
--- a/b2g/config/mozconfigs/gb_armv7a_gecko/nightly
+++ b/b2g/config/mozconfigs/gb_armv7a_gecko/nightly
@@ -1,5 +1,3 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
 
 mk_add_options MOZ_MAKE_FLAGS="-j8"
diff --git a/b2g/config/mozconfigs/ics_armv7a_gecko/nightly b/b2g/config/mozconfigs/ics_armv7a_gecko/nightly
index 94e355a890d4..583b3a94d36a 100644
--- a/b2g/config/mozconfigs/ics_armv7a_gecko/nightly
+++ b/b2g/config/mozconfigs/ics_armv7a_gecko/nightly
@@ -1,5 +1,3 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
 
 mk_add_options MOZ_MAKE_FLAGS="-j8"
diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly
index 22ba1ef76630..3b7a2e833d5d 100644
--- a/b2g/config/mozconfigs/linux32_gecko/nightly
+++ b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -1,5 +1,3 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
diff --git a/b2g/config/mozconfigs/win32_gecko/nightly b/b2g/config/mozconfigs/win32_gecko/nightly
index 1a2145ab00d6..affb7f1b1984 100644
--- a/b2g/config/mozconfigs/win32_gecko/nightly
+++ b/b2g/config/mozconfigs/win32_gecko/nightly
@@ -1,5 +1,3 @@
-. "$topsrcdir/b2g/config/mozconfigs/common"
-
 # for pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug
index f8cbd2d189aa..e3dcc5d4f86e 100644
--- a/browser/config/mozconfigs/macosx32/debug
+++ b/browser/config/mozconfigs/macosx32/debug
@@ -1,5 +1,4 @@
 . $topsrcdir/build/macosx/mozconfig.leopard
-
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
index e9b68e1b2979..304914322cad 100644
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,5 +1,3 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
index 3ddbc441d711..709e5220de99 100644
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -1,5 +1,3 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig
index 5ac1722dddbc..75ccdfe256b0 100644
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,5 +1,3 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-official-branding
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
index 1d2c9683b6d7..8500c9d0779d 100644
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -1,5 +1,3 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
 # for pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 
diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release
index 53f1f91fb373..bb684af42c87 100644
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -1,5 +1,3 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-
 # for pgo
 mk_add_options MOZ_PGO=1
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'