From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Sep 2011 14:43:15 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~20^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7c0fce586f18ab3df70de1138f85b5bfc72e1a6e;hp=-c

Merge branch 'master' into next
---

7c0fce586f18ab3df70de1138f85b5bfc72e1a6e