From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 22 Oct 2010 18:17:15 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~44
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=38c982bb77390f53744815eedb877ebeab05ba4b

Merge commit 'origin/master' into next

Conflicts:
	src/paks/linux-pae/uninstall.sh
---

38c982bb77390f53744815eedb877ebeab05ba4b
diff --cc make.sh
index cc2d3c5007,d5ec02c5a3..a02dadb51c
--- a/make.sh
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)					# Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
- TOOLCHAINVER=2
 -TOOLCHAINVER=3
++TOOLCHAINVER=1
  IPFVER="full"				# Which versions should be compiled? (full|devel)
  
  # Debian specific settings