From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 15:07:10 +0000 (+0100)
Subject: Merge from alioth
X-Git-Tag: userdir-ldap-0.3.16~4
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=7d60d9e30d7bc316b356ce98406c799106ab8428

Merge from alioth
---

7d60d9e30d7bc316b356ce98406c799106ab8428