From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 24 Nov 2009 09:46:31 +0000 (+0100)
Subject: Merge commit 'farnsworth/updates'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e92a315635689a814d6927fa113a3dba3ebcc72;p=ipfire-3.x.git

Merge commit 'farnsworth/updates'
---

8e92a315635689a814d6927fa113a3dba3ebcc72