From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 19 Jan 2011 23:17:35 +0000 (+0100)
Subject: Merge branch 'master' into perl_5.12.2
X-Git-Tag: v2.9-core48~15^2^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40fcc865dcc3c483ec9b52f79cec2249599ff480;p=ipfire-2.x.git

Merge branch 'master' into perl_5.12.2
---

40fcc865dcc3c483ec9b52f79cec2249599ff480