From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sun, 11 Apr 2010 17:45:04 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ad5ead0d9ddfa27c44b500787e9cff2efd645f1;p=ipfire-2.x.git

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

4ad5ead0d9ddfa27c44b500787e9cff2efd645f1