From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 5 Jan 2012 13:59:54 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core56^2~24^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc29e3d019407db10bffe64ac0accd17c8dd42d8;p=ipfire-2.x.git

Merge branch 'master' into next
---

dc29e3d019407db10bffe64ac0accd17c8dd42d8