From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 May 2010 12:16:50 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7af312173f5c7e5208313df8fef477791f4ef2c;p=ipfire-3.x.git

Merge branch 'next'
---

a7af312173f5c7e5208313df8fef477791f4ef2c