From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 30 Aug 2010 19:40:55 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~95
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
---

6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae