From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 18 Oct 2008 19:09:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~532
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57ef7683cf974bb75b991d2bbf9295f73e6fa62c;p=ipfire-3.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
---

57ef7683cf974bb75b991d2bbf9295f73e6fa62c