From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 18 Aug 2010 19:54:42 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~105
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=908719c955c7af7752ee09bcb6a79d2a3919a22e;hp=908719c955c7af7752ee09bcb6a79d2a3919a22e

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
---