From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 10 Oct 2010 10:05:56 +0000 (+0200)
Subject: Merge commit 'origin'; branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~60^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc;p=ipfire-2.x.git

Merge commit 'origin'; branch 'master' into next
---

528f824cfbb0e8bed7e56e9ebf4d2624ac27eefc