From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 24 Sep 2011 13:57:29 +0000 (+0000)
Subject: Merge branch 'next' into arm-port
X-Git-Tag: v2.9-core54~13^2~53^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff1580d89dbe3916fdcd8523d33eb422b2907341;p=ipfire-2.x.git

Merge branch 'next' into arm-port
---

ff1580d89dbe3916fdcd8523d33eb422b2907341