From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Nov 2010 18:42:22 +0000 (+0100)
Subject: Merge branch 'next' into selinux
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83dc82d564b65b62ca5bc5bab43af557a24fadbc;p=ipfire-3.x.git

Merge branch 'next' into selinux
---

83dc82d564b65b62ca5bc5bab43af557a24fadbc