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

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	

config/samba/default.printer

@@ -9,6 +9,7 @@ printable   = yes
 public      = yes
 writable    = no
 create mode = 0700
+use client driver = yes
 
 [Drucker]
 security      = server