Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/26/files b/config/rootfiles/core/26/files
index 9c27d4c65484227b20bd4c80c2d008a7a09d2dc3..23dfa6165968339b17a996ff1ffb0808c9f01f12 100644 (file)
--- a/config/rootfiles/core/26/files
+++ b/config/rootfiles/core/26/files
@@ -1,3 +1,7 @@
 usr/sbin/pptp
 etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/pppsetup.cgi
+srv/web/ipfire/html/include/jquery-1.2.6.min.js
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/cgi-bin/proxy.cgi
+usr/sbin/updxlrator    

diff --git a/config/samba/default.printer b/config/samba/default.printer
index e2977007c1b528bfb5c273365d849b82ccc39a13..a4f04ccbdc99c008e1d5095a63a2eb3c4497e7a0 100644 (file)
--- a/config/samba/default.printer
+++ b/config/samba/default.printer
@@ -9,6 +9,7 @@ printable   = yes
 public      = yes
 writable    = no
 create mode = 0700
+use client driver = yes
 
 [Drucker]
 security      = server