From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Jul 2012 17:40:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-update
X-Git-Tag: v2.13-beta1~330
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c78993cdde0391d1336797dd4368b41794a40487;p=people%2Fms%2Fipfire-2.x.git

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

c78993cdde0391d1336797dd4368b41794a40487