From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 20 Oct 2010 16:18:34 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~53
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=59093c5ec474be7eb22c17a8f1cb0c1922f1f93a

Merge commit 'origin/master' into next

Conflicts:
	config/rootfiles/core/41/exclude
	config/rootfiles/core/41/filelists/files
---

59093c5ec474be7eb22c17a8f1cb0c1922f1f93a