From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 18 Aug 2010 21:14: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=0fc54015d965aec382a81754aebd7727e4717efc;p=ipfire-3.x.git

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

0fc54015d965aec382a81754aebd7727e4717efc