From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 6 May 2011 10:33:44 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~124^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a99de963c9f272ec8850002a734dca4aa1f77dae;p=ipfire-2.x.git

Merge branch 'master' into next
---

a99de963c9f272ec8850002a734dca4aa1f77dae