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

merge from alioth
---

7a14013dff13a4dd7689f8c35c4f0d1c4f17ef19