From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 21 Oct 2010 18:43:45 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638;p=ipfire-2.x.git

Merge commit 'origin/master' into next

Conflicts:
	config/rootfiles/core/41/filelists/files
	src/paks/linux-pae/uninstall.sh
---

c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638