From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 17 Jul 2010 13:44:03 +0000 (+0200)
Subject: Merge commit 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4339e71e5450b4eb60a6172e07ea40df02197e03;p=ipfire-3.x.git

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

4339e71e5450b4eb60a6172e07ea40df02197e03