Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

diff --combined make.sh
index 660bfbe1495b0746ec34a7606d8fd3e772fd2295,b73cc72f961883adeaa6ff4fd1c41a330262a00a..b2eea710429706a6a15cc9960677b0971c1123b1
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.10"                                                        # Version number
 -CORE="51"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="50"                                             # Core Level (PAKFIRE)
 +CORE="52"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="51"                                             # 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,6 +693,6 @@@ buildipfire() 
    ipfiremake wireless-regdb
    ipfiremake crda
    ipfiremake libsatsolver
-   ipfiremake python-satsolver
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar