From: Jan Paul Tuecking <earl@ipfire.org>
Date: Tue, 31 May 2011 20:27:53 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~100^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0df2024f29c9e955dd0bfe4df84afce757d40e26;p=people%2Fpmueller%2Fipfire-2.x.git

Merge branch 'master' into next
---

0df2024f29c9e955dd0bfe4df84afce757d40e26