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

Merge branch 'master' into next
---

b751ad81814bd71d9ddf32607c992dbbddfd417c