From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 20 Feb 2011 16:37:07 +0000 (+0100)
Subject: Merge branch 'master' into perl_5.12.2
X-Git-Tag: v2.9-core48~15^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4200583c7084c8a048ce9b568bac62a8a4e8bcb1;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' into perl_5.12.2

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

4200583c7084c8a048ce9b568bac62a8a4e8bcb1