--- a/firefox-kde.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-kde.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1145,11 +1145,11 @@
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/content.js                    (content/content.js)
  *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
+ *       content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
+ *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
  *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
  *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
- *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
- *       content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
- *       content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1166,13 +1166,13 @@
 +#include "nsUnixShellService.h"
  #endif
  
- #include "nsProfileMigrator.h"
  #if defined(XP_WIN) && !defined(__MINGW32__)
  #include "nsIEProfileMigrator.h"
  #elif defined(XP_MACOSX)
  #include "nsSafariProfileMigrator.h"
  #endif
-@@ -68,18 +68,16 @@ using namespace mozilla::browser;
+ 
+@@ -67,18 +67,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1185,13 +1185,13 @@
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
  #if defined(XP_WIN) && !defined(__MINGW32__)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
  #elif defined(XP_MACOSX)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
  #endif
-@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
+ 
+@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
  #endif
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
@@ -1205,15 +1205,15 @@
  #endif
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
-     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
  #if defined(XP_WIN) && !defined(__MINGW32__)
      { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
  #elif defined(XP_MACOSX)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
+     { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor },
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -697,24 +697,42 @@ var gAdvancedPane = {
+@@ -716,24 +716,42 @@ var gAdvancedPane = {
      var brandBundle = document.getElementById("bundleBrand");
      var shellBundle = document.getElementById("bundleShell");
      var brandShortName = brandBundle.getString("brandShortName");
@@ -1716,7 +1716,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
-@@ -440,16 +440,17 @@
+@@ -449,16 +449,17 @@
  #endif
  #endif