From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 May 2010 23:53:14 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bad6c2fc895e5e8f549b2af722cc85c47d57bb8;p=ipfire-3.x.git

Merge branch 'next'
---

0bad6c2fc895e5e8f549b2af722cc85c47d57bb8