From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Mar 2010 23:01:46 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7975e1c9468c146c312430a8e8d01a4cb158ef46;p=ipfire-3.x.git

Merge branch 'next'
---

7975e1c9468c146c312430a8e8d01a4cb158ef46