From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 May 2010 21:52:01 +0000 (+0200)
Subject: Merge commit 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271e42f86c49c522ebc3eb436e6527ef4177122c;p=ipfire-3.x.git

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

271e42f86c49c522ebc3eb436e6527ef4177122c