From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 21 May 2011 18:59:16 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65f0333066db08ccaf9d0cf647f23ec5279e8ebe;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

65f0333066db08ccaf9d0cf647f23ec5279e8ebe