From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 Oct 2008 17:54:31 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta4~12^2~6
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fc6f9de78766b16e8592be6f39412293ecab60ea

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

fc6f9de78766b16e8592be6f39412293ecab60ea