From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 10 Nov 2010 21:01:28 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~30
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=50f696157ff447b332b92588588dbfa5cf98fef3

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

50f696157ff447b332b92588588dbfa5cf98fef3