From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Tue, 25 Jan 2011 23:32:12 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-core45~1^2~5^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf997605e529e895e90c4691c3b418e279dcfbb1;p=people%2Fms%2Fipfire-2.x.git

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

cf997605e529e895e90c4691c3b418e279dcfbb1