From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 3 Jul 2011 09:03:57 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~81
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=74459c0aded2cceae19e1bff2ce9a899cf0168c0

Merge branch 'master' into next
---

74459c0aded2cceae19e1bff2ce9a899cf0168c0