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

Merge from alioth
---

dabc4243524d6c43a709f0c64828e70d9e51fdfa