From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 3 Sep 2011 14:05:55 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=035f1702efd0626ec0bb2c6e165600c0bb98ef0c

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

035f1702efd0626ec0bb2c6e165600c0bb98ef0c