From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 14 Mar 2012 09:37:16 +0000 (+0100)
Subject: Merge commit 'origin/next' into kernel-update
X-Git-Tag: v2.13-beta1~376
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13dcb4ee03b682dcc2be95f87274eaf9ec0fd35c;p=people%2Fms%2Fipfire-2.x.git

Merge commit 'origin/next' into kernel-update
---

13dcb4ee03b682dcc2be95f87274eaf9ec0fd35c