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

Merge branch 'master' into perl_5.12.2

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

245ff333e80fd916b990a721f13e9325709fec92