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

Merge branch 'next'
---

d7d29a1067fee45143f3ad12f103dd30555e9ee1