Merge lp:~micahg/firefox/firefox-3.6.head.daily-patch-rebase-20090915 into lp:firefox/3.6

[Micah Gersten]

[Micah Gersten (micahg)]

Build worked fine:
https://edge.launchpad.net/~micahg/+archive/mozilla-test/+packages

[Alexander Sack (asac)]

looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-11 13:37:22 +0000
+++ debian/changelog	2009-09-16 05:57:54 +0000
@@ -1,4 +1,4 @@
-firefox-3.6 (3.6~a2~hg20090910r31604+nobinonly-0ubuntu1) UNRELEASED; urgency=low
+firefox-3.6 (3.6~a2~hg20090915r31768+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 
   [ H. Montoliu <[e-mail]> ]
   * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
@@ -136,7 +136,7 @@
     - update debian/patches/browser_branding.patch
     - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch
 
- -- Alexander Sack <[e-mail]>  Fri, 11 Sep 2009 15:36:31 +0200
+ -- Micah Gersten <[e-mail]>  Wed, 16 Sep 2009 00:43:11 -0500
 
 firefox-3.1 (3.1~b3~hg20081221r22451+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 

=== modified file 'debian/patches/firefox-profilename'
--- debian/patches/firefox-profilename	2009-07-24 20:31:24 +0000
+++ debian/patches/firefox-profilename	2009-09-16 05:59:07 +0000
@@ -169,11 +169,11 @@
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
  
+ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
+ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
+ 
  pref("xpinstall.whitelist.add", "update.mozilla.org");
- pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
- 
- pref("keyword.enabled", true);
-@@ -834,17 +834,17 @@
+@@ -832,17 +832,17 @@
  
  // replace newlines with spaces when pasting into <input type="text"> fields
  pref("editor.singleLine.pasteNewlines", 2);