From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Apr 2010 14:35:12 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=044e7bd04c1803bef192125dde61a93f6dd91af9;p=ipfire.org.git

Merge branch 'next'
---

044e7bd04c1803bef192125dde61a93f6dd91af9