From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Nov 2010 20:57:21 +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=d96ce6b7e10cd48c07c0c0c04d332fc5442f7ffe;p=ipfire-3.x.git

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

d96ce6b7e10cd48c07c0c0c04d332fc5442f7ffe