Merge branch 'master' into next

Conflicts:
	make.sh

diff --combined make.sh
index af884716983617250e1aeb4f7b4d594a960e1838,82a671ae403d3bb5010292af8177fb1060e2aa8b..c986ec80eb09bdbb40099fadf063a0af173d780f
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.9"                                                 # Version number
 +VERSION="2.10"                                                        # Version number
- CORE="52"                                                     # Core Level (Filename)
- PAKFIRE_CORE="51"                                             # Core Level (PAKFIRE)
+ CORE="53"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="52"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -693,7 -693,8 +693,7 @@@ buildipfire() 
    ipfiremake python-m2crypto
    ipfiremake wireless-regdb
    ipfiremake crda
 -  ipfiremake libsatsolver
 -  ipfiremake python-satsolver
 +  ipfiremake libsolv
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar
@@@ -709,7 -710,7 +709,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