From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 2 Jun 2011 17:16:38 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~97
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5c5fd846ac363475256679ad8b0ac94502d82686;hp=-c

Merge branch 'master' into next
---

5c5fd846ac363475256679ad8b0ac94502d82686