From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 Jun 2011 11:49:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~100^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a409c362c6da97487151fd8e8c19ca10d64eae1e;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

a409c362c6da97487151fd8e8c19ca10d64eae1e