From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 27 Jul 2011 16:41:31 +0000 (+0200)
Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=599d475a53aa6050014fd1f347f2ace43d955dde;hp=-c

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

599d475a53aa6050014fd1f347f2ace43d955dde
diff --combined make.sh
index 660bfbe14,b73cc72f9..b2eea7104
--- a/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