From: Maniacikarus <maniacikarus@ipfire.org>
Date: Tue, 28 Oct 2008 17:15:07 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-final~28
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ea317fe337f95e1e9d14dcd85b3cf90b18f89cab

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

ea317fe337f95e1e9d14dcd85b3cf90b18f89cab