diff --git a/browser/config/mozconfigs/macosx-lion-universal/nightly b/browser/config/mozconfigs/macosx-lion-universal/nightly
deleted file mode 100644
index 571e8029610d8f4304a6a72e8d550b5f4b84e4b5..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx-lion-universal/nightly
+++ /dev/null
@@ -1,25 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-ac_add_options --enable-signmar
-
-# Nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_MAKE_FLAGS="-j12"
-
-ac_add_options --with-macbundlename-prefix=Firefox
-
-# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
-ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx-lion-universal/release b/browser/config/mozconfigs/macosx-lion-universal/release
deleted file mode 100644
index 0acefb03ecd858f11ce78903ff2603e3ee2b3f7e..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx-lion-universal/release
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-official-branding
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
-ac_add_options --enable-warnings-as-errors
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx-lion-universal/shark b/browser/config/mozconfigs/macosx-lion-universal/shark
deleted file mode 100644
index 48f355dbe1b146fd78ee8f1b1a3fe10a120ea4b7..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx-lion-universal/shark
+++ /dev/null
@@ -1,26 +0,0 @@
-# Just like nightlies, but without tests, not on an update channel, and with
-# shark and dtrace enabled
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-tests
-ac_add_options --disable-install-strip
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j12"
-
-# shark specific options
-ac_add_options --enable-shark
-ac_add_options --enable-dtrace
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL="shark"
-
-# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
-ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
index a0cd245694d684da8cf5a0e3f7164b506b33cd5e..734ce3f15e86cccba49780836876984cd773a336 100644
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -16,12 +16,13 @@ ac_add_options --enable-js-diagnostics
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx-universal/shark b/browser/config/mozconfigs/macosx-universal/shark
index 671a00cfb0c2f438e6330805065a18bfb17a602e..48f355dbe1b146fd78ee8f1b1a3fe10a120ea4b7 100644
--- a/browser/config/mozconfigs/macosx-universal/shark
+++ b/browser/config/mozconfigs/macosx-universal/shark
@@ -12,7 +12,7 @@ ac_add_options --disable-install-strip
 export MOZILLA_OFFICIAL=1
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # shark specific options
 ac_add_options --enable-shark
@@ -23,3 +23,4 @@ export MOZ_PKG_SPECIAL="shark"
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx32-lion/debug b/browser/config/mozconfigs/macosx32-lion/debug
deleted file mode 100644
index 10dcda144986fe83f7a120dde0d5ea308f7d87e6..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx32-lion/debug
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/mozconfig.leopard
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-signmar
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j12"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-macbundlename-prefix=Firefox
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug
index 8b13f66b0b68ffd342ae826cfbc594ffa488ba09..d63a10e356106d9e7a661d8d84e525b98245f3cb 100644
--- a/browser/config/mozconfigs/macosx32/debug
+++ b/browser/config/mozconfigs/macosx32/debug
@@ -4,12 +4,13 @@ ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64-lion/debug b/browser/config/mozconfigs/macosx64-lion/debug
deleted file mode 100644
index daa52c4ee597528c33a4c64817ae9840865d2dba..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx64-lion/debug
+++ /dev/null
@@ -1,18 +0,0 @@
-. $topsrcdir/build/macosx/common
-
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-accessibility
-ac_add_options --enable-signmar
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j12"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-macbundlename-prefix=Firefox
-
-# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
-ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig b/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig
deleted file mode 100644
index 304914322cad559e71d9ed5ed896a79eaedd24ec..0000000000000000000000000000000000000000
--- a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-ac_add_options --with-l10n-base=../../l10n-central
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
index 7e0994cea659fff21b7850563d0d55cbc04dea52..c1bcc436e28e6baa27094e3803e48404c4df8a8c 100644
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -6,7 +6,7 @@ ac_add_options --enable-accessibility
 ac_add_options --enable-signmar
 
 # Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+mk_add_options MOZ_MAKE_FLAGS="-j12"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
@@ -15,6 +15,7 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
index 52e60067768792e626a61b19157ea7a42b5d35a2..304914322cad559e71d9ed5ed896a79eaedd24ec 100644
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -2,3 +2,4 @@ ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
+ac_add_options --with-ccache
diff --git a/content/base/src/nsDOMMutationObserver.h b/content/base/src/nsDOMMutationObserver.h
index 18e97bd527e5599d4237c0f006bd88200bc63638..4c276b26981da4406bd23b014425a57c891c4c2e 100644
--- a/content/base/src/nsDOMMutationObserver.h
+++ b/content/base/src/nsDOMMutationObserver.h
@@ -152,7 +152,7 @@ protected:
   nsMutationReceiverBase(nsINode* aRegisterTarget,
                          nsMutationReceiverBase* aParent)
   : mTarget(nsnull), mObserver(nsnull), mParent(aParent),
-    mRegisterTarget(aRegisterTarget)
+    mRegisterTarget(aRegisterTarget), mKungFuDeathGrip(aParent->Target())
   {
     NS_ASSERTION(mParent->Subtree(), "Should clone a non-subtree observer!");
     mRegisterTarget->AddMutationObserver(this);
@@ -195,6 +195,9 @@ protected:
   // This is different than mTarget when dealing with transient observers.
   nsINode*                           mRegisterTarget;
   nsCOMArray<nsMutationReceiverBase> mTransientReceivers;
+  // While we have transient receivers, keep the original mutation receiver
+  // alive so it doesn't go away and disconnect all its transient receivers.
+  nsCOMPtr<nsINode>                  mKungFuDeathGrip;
   
 private:
   bool                               mSubtree;