From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Aug 2010 12:33:27 +0000 (+0200)
Subject: Merge commit 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b299932265ac0fb559042946a8ecd7641990cbc9;p=ipfire-3.x.git

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

b299932265ac0fb559042946a8ecd7641990cbc9