From: Maniacikarus <maniacikarus@ipfire.org>
Date: Wed, 7 Jan 2009 19:02:13 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-beta1~217^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2dc42056b87a44eec55fa1f5f76dde9197e762e;p=people%2Fms%2Fipfire-2.x.git

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

c2dc42056b87a44eec55fa1f5f76dde9197e762e