From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 13 Nov 2010 18:17:17 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~26
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=846571ac8455c663fc75b0970eb76c4a92eea3be

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

846571ac8455c663fc75b0970eb76c4a92eea3be