Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	make.sh

diff --cc config/rootfiles/common/initscripts
Simple merge

diff --cc config/rootfiles/core/43/filelists/files
index 995b690700903b151d24a3d48c03c26133223148,eb3c9517ec5ed2bf72776cee588bf735a7d97665..49c6586bb6f7b68da7cc8abc54b06d3dc5c6e37d
--- 1/config/rootfiles/core/43/filelists/files
--- 2/config/rootfiles/core/43/filelists/files
+++ b/config/rootfiles/core/43/filelists/files
@@@ -1,2 -1,11 +1,12 @@@
 +etc/init.d/firewall
  etc/system-release
+ etc/rc.d/init.d/checkfs
+ etc/rc.d/init.d/checkfstab
+ etc/rc.d/init.d/squid
+ srv/web/ipfire/cgi-bin/proxy.cgi
+ srv/web/ipfire/cgi-bin/speed.cgi
+ srv/web/ipfire/cgi-bin/vpnmain.cgi
+ srv/web/ipfire/html/images/urlfilter/copy.gif
+ var/ipfire/general-functions.pl
+ usr/local/bin/rebuild-initrd
+ usr/bin/ldd

diff --cc make.sh
index fa13d0d796050a4c70a37f7e346e3d8e01a04757,d9abd2a4746d416499e8b67996cfa95001263c02..a3671e9e5abfdfb0a9f9ed97a27d68329e166484
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -658,8 -678,9 +678,10 @@@ buildipfire() 
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
+   ipfiremake tcl
    ipfiremake imspector
 +  ipfiremake miniupnpd
+   ipfiremake client175
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild