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

Merge branch 'master' into next
---

bc481fef281da3512ae10fd1f8810244c0586c74