From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 12 Jul 2011 20:30:47 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-core53~70
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7b57b6f44151e64ac223524e13fc4b46d78ed1c3

Merge commit 'origin/master' into next
---

7b57b6f44151e64ac223524e13fc4b46d78ed1c3