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

diff --combined make.sh
index 2de4d2db1777898bf27529ea219ac21836672ca6,b89c77a4a9f310b487d7754e5692359ac759998a..d53d0ec840ee51c8ce5b39daf86da7a5f6fd971d
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -247,7 -247,6 +247,7 @@@ buildtoolchain() 
      NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
      export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
      lfsmake1 ccache   PASS=1
 +    lfsmake1 make     PASS=1
      lfsmake1 binutils PASS=1
      lfsmake1 gcc              PASS=1
      export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@@ -271,7 -270,7 +271,7 @@@
      lfsmake1 grep
      lfsmake1 gzip
      lfsmake1 m4
 -    lfsmake1 make
 +    lfsmake1 make     PASS=2
      lfsmake1 patch
      lfsmake1 perl
      lfsmake1 sed
@@@ -690,6 -689,7 +690,7 @@@ buildipfire() 
    ipfiremake swig
    ipfiremake python-m2crypto
    ipfiremake crda
+   ipfiremake libsatsolver
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild