From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Jun 2013 11:12:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'jlentfer/multicat' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=97f0fdd5f3a9fc93c01be9e48b16090bc4559191

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

Conflicts:
	make.sh
---

97f0fdd5f3a9fc93c01be9e48b16090bc4559191
diff --cc make.sh
index 939a04e9c,cec515530..af515bfa6
--- a/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