From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 23 May 2011 19:52:13 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~111
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9eca0c864505f02d794d00d46c53aa91524371b4

Merge branch 'master' into next
---

9eca0c864505f02d794d00d46c53aa91524371b4