From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 6 Oct 2010 16:38:27 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~69
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=650b057076a8cfe7f6987573a866911472a26c08

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

650b057076a8cfe7f6987573a866911472a26c08