From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Feb 2011 23:29:59 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=766d95bfda1ef85442d8fa9fc1c468dff6b34563;p=ipfire-3.x.git

Merge branch 'next'
---

766d95bfda1ef85442d8fa9fc1c468dff6b34563