[SCM] debian-live/config-webc branch, master, updated. 70b2eac5072579e0fea6160dd64ad00e0c3fff03

[Kai Hendry]

The following commit has been merged in the master branch:
commit 70b2eac5072579e0fea6160dd64ad00e0c3fff03
Author: Kai Hendry <hendry at iki.fi>
Date:   Mon Feb 22 12:34:29 2010 +0100

    fix UA string override

diff --git a/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js b/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
index 9280bb0..6b71aa9 100644
--- a/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
+++ b/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
@@ -1,20 +1,6 @@
-// This is the Debian specific preferences file for Iceweasel
-// You can make any change in here, it is the purpose of this file.
-// You can, with this file and all files present in the
-// /etc/iceweasel/pref directory, override any preference that is
-// present in /usr/lib/iceweasel/defaults/preferences directory.
-// While your changes will be kept on upgrade if you modify files in
-// /etc/iceweasel/pref, please note that they won't be kept if you
-// do make your changes in /usr/lib/iceweasel/defaults/preferences.
-//
-// Note that lockPref is allowed in these preferences files if you
-// don't want users to be able to override some preferences.
-
 pref("extensions.update.enabled", false);
 
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);
 
-// Disable default browser checking.
 pref("browser.shell.checkDefaultBrowser", false);
-pref("general.useragent.extra.firefox", "Firefox/2.0");

-- 
debian-live/config-webc