From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Jun 2011 12:44:23 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~96
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ee11332d40ab1482cf9a89f6aaf6cb49d56c9726

Merge branch 'master' into next
---

ee11332d40ab1482cf9a89f6aaf6cb49d56c9726