From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Mar 2010 15:40:28 +0000 (+0100)
Subject: Merge commit 'stevee/openldap' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f8bded91b9a9935ca4e8c137803f5d0921410d8;p=ipfire-3.x.git

Merge commit 'stevee/openldap' into next
---

4f8bded91b9a9935ca4e8c137803f5d0921410d8