From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 2 May 2012 14:55:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core61^2~53^2~5
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-2.x.git;a=commitdiff_plain;h=9c166bf2a6a3d8d8df1ad29b6e631671cc33536d

Merge branch 'master' into next
---

9c166bf2a6a3d8d8df1ad29b6e631671cc33536d