From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 14 Oct 2010 06:33:27 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~58
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=799cc0f3a9524abbbd6cca803795206e2112a00e

Merge commit 'origin/master' into next

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

799cc0f3a9524abbbd6cca803795206e2112a00e