From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 10 Mar 2012 16:47:01 +0000 (+0100)
Subject: Merge branch 'next' into kernel-update
X-Git-Tag: v2.13-beta1~380
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e18c5b3a42479db27f17ce603750e4acf0ab8c4b;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into kernel-update
---

e18c5b3a42479db27f17ce603750e4acf0ab8c4b