From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 27 Feb 2011 20:21:50 +0000 (+0100)
Subject: Merge branch 'master' into fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aef8bd7250bf167610a7fa522cd06560ebecbd6;p=ipfire-3.x.git

Merge branch 'master' into fixes
---

3aef8bd7250bf167610a7fa522cd06560ebecbd6