From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 4 Sep 2011 13:59:37 +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=9c7da0c6d9adc6020a4815a90f0bb5930d57a97b

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

9c7da0c6d9adc6020a4815a90f0bb5930d57a97b