From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Tue, 8 Feb 2011 21:05:30 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-core46~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e;p=ipfire-2.x.git

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

bf7466f5d1069a6b46fe8eb7b8c52dffa656c95e