From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 31 Oct 2010 15:12:53 +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=7e42e81b075291d0f4a42d470560d396b171d40f;p=ipfire-3.x.git

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

7e42e81b075291d0f4a42d470560d396b171d40f