From: root <root@iConnect.warriors.homedns.org>
Date: Sun, 18 Mar 2012 14:58:21 +0000 (+0100)
Subject: Merge commit 'origin/next' into kernel-update
X-Git-Tag: v2.13-beta1~370
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3a082a7c88143b2495a9d2339cfda809bd7bf5fb

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

3a082a7c88143b2495a9d2339cfda809bd7bf5fb