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

Merge from alioth
---

9301e72abff959ad084a72d50169a31c898c304b