From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 Jun 2011 07:16:29 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~88^2~1^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=38ad04851347da66b36d2120254d7c93bf03f26f

Merge branch 'master' into next
---

38ad04851347da66b36d2120254d7c93bf03f26f