From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Dec 2011 13:03:42 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core56^2~25^2~4^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c01c550df8a24dc1591441a6e9c005d2c9261b94

Merge branch 'master' into next
---

c01c550df8a24dc1591441a6e9c005d2c9261b94