From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 3 Feb 2009 14:08:44 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6efa3cc0a392d54a9f1259d3e800a1f813480c0;p=ipfire-3.x.git

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

b6efa3cc0a392d54a9f1259d3e800a1f813480c0