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

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

f33ffa7b97967c6332c354c03ff717e5087fa49f