Merge branch 'master' into next

diff --combined make.sh
index e9b3f8888599e85923ae6cf32757283c195678af,d53d0ec840ee51c8ce5b39daf86da7a5f6fd971d..22af8396384977fffd268b5ea5fec05f0b0c43a1
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
  CORE="49"                                                     # Core Level (Filename)
  PAKFIRE_CORE="48"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -247,6 -247,7 +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
@@@ -270,7 -271,7 +271,7 @@@
      lfsmake1 grep
      lfsmake1 gzip
      lfsmake1 m4
-     lfsmake1 make
+     lfsmake1 make     PASS=2
      lfsmake1 patch
      lfsmake1 perl
      lfsmake1 sed
@@@ -689,6 -690,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
@@@ -698,7 -700,7 +700,7 @@@
    echo >> $BASEDIR/build/var/ipfire/firebuild
    cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
    echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 -  if [ "$GIT_BRANCH" = "master" ]; then
 +  if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
    else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release