From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 10 Dec 2010 23:32:24 +0000 (+0100)
Subject: Merge branch 'master' into 2.9beta1
X-Git-Tag: v2.9-beta1~3^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=852c45d289fec8d5740a81741c11b26993dbbe6e;p=ipfire-2.x.git

Merge branch 'master' into 2.9beta1
---

852c45d289fec8d5740a81741c11b26993dbbe6e