Merge remote-tracking branch 'jlentfer/multicat' into next

Conflicts:
	make.sh

diff --cc make.sh
index 939a04e9c6f3f59d4eaadc7a1390af37358b5a1b,cec5155303b2a22c513a5d088788265effd157f5..af515bfa6d591ef98e830668a1578c9df2df7696
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -765,9 -765,8 +765,11 @@@ buildipfire() 
    ipfiremake nginx
    ipfiremake sendEmail
    ipfiremake sysbench
 +  ipfiremake strace
 +  ipfiremake ipfire-netboot
 +  ipfiremake lcdproc
+   ipfiremake bitstream
+   ipfiremake multicat
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild