From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 12 Sep 2011 21:44:44 +0000 (+0200)
Subject: Merge commit 'origin/next'
X-Git-Tag: v2.9-core53~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a01ce24dae2a6ce2438c2dd603de05af4eecbbbe;p=ipfire-2.x.git

Merge commit 'origin/next'
---

a01ce24dae2a6ce2438c2dd603de05af4eecbbbe