diff -r 475395d00191 -r ff30593d2daa firefox-no-default-ualocale.patch
--- a/firefox-no-default-ualocale.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-no-default-ualocale.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f
+# Parent 4de3b724d8c78c38713aee20a01c702e132c2c4c
 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp
+@@ -230,17 +230,17 @@ pref("xpinstall.whitelist.add.36", "getp
  
  pref("lightweightThemes.update.enabled", true);
  
@@ -19,7 +19,7 @@
 +pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.skins.selectedSkin", "classic/1.0");
  
- pref("general.smoothScroll", false);
+ pref("general.smoothScroll", true);
  #ifdef UNIX_BUT_NOT_MAC
  pref("general.autoScroll", false);
  #else