--- a/firefox-branded-icons.patch	Fri May 25 09:12:54 2012 +0200
+++ b/firefox-branded-icons.patch	Fri Jun 08 06:54:39 2012 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent cb004c79ce12bac3db93e34909cc979f2eecab4b
+# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -161,16 +161,21 @@ endif
+@@ -160,16 +160,21 @@ endif
  endif #} LIBXUL_SDK
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -23,9 +23,9 @@
  libs:: $(srcdir)/profile/prefs.js
  	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
  
- libs:: $(srcdir)/blocklist.xml
- 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
- 
+ # channel-prefs.js is handled separate from other prefs due to bug 756325
+ libs:: $(srcdir)/profile/channel-prefs.js
+ 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
@@ -54,7 +54,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -478,18 +478,21 @@
+@@ -476,18 +476,21 @@
  @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi