From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 24 Jun 2011 09:10:13 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~92
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a806976e3618736e9054043eae2eb8e65e2bc626

Merge branch 'master' into next
---

a806976e3618736e9054043eae2eb8e65e2bc626