From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 19 Aug 2010 12:49:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~102
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b1d3e68d50513e0b119b455b652d80727060af0

Merge branch 'master' into next

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

0b1d3e68d50513e0b119b455b652d80727060af0