From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 May 2012 22:54:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-update
X-Git-Tag: v2.13-beta1~355
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4117423409b702ef5f3f2ed6a5bd59197c05b784;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'origin/next' into kernel-update
---

4117423409b702ef5f3f2ed6a5bd59197c05b784