Merge branch 'libsatsolver' into next

diff --combined make.sh
index 8c08fc34cb8384708c1f06aea8f1303eab1b78c8,30023e599a82f5242141c7d644d921ca1c3aabc7..b73cc72f961883adeaa6ff4fd1c41a330262a00a
--- 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="51"                                                     # Core Level (Filename)
  PAKFIRE_CORE="50"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
@@@ -358,7 -358,6 +358,7 @@@ buildipfire() 
    ipfiremake which
    ipfiremake xz
    ipfiremake linux-firmware
 +  ipfiremake zd1211-firmware
    ipfiremake linux                    XEN=1
    ipfiremake kqemu                    XEN=1
    ipfiremake v4l-dvb                  XEN=1
@@@ -690,10 -689,8 +690,9 @@@
    ipfiremake parted
    ipfiremake swig
    ipfiremake python-m2crypto
 +  ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
-   ipfiremake python-satsolver
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar
@@@ -709,7 -706,7 +708,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