From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 20 Dec 2010 13:18:52 +0000 (+0100)
Subject: Merge remote branch 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4fd4e17a8841f55ffade839a78b7fe2ca45db9;p=ipfire-3.x.git

Merge remote branch 'stevee/updates' into next
---

ca4fd4e17a8841f55ffade839a78b7fe2ca45db9