From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 May 2010 13:49:14 +0000 (+0200)
Subject: Merge commit 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92b9693dc07e66eb81dcb34ca60e52cf5151e84;p=ipfire-3.x.git

Merge commit 'stevee/updates' into next
---

f92b9693dc07e66eb81dcb34ca60e52cf5151e84