From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 Feb 2012 20:54:26 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core57~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdde104f2d7a333b79fe61eeeb77582efe10cb58;p=people%2Ftrikolon%2Fipfire-2.x.git

Merge branch 'master' into next
---

fdde104f2d7a333b79fe61eeeb77582efe10cb58