From: Mark Hymers <mhy@debian.org>
Date: Wed, 14 May 2008 19:37:13 +0000 (+0100)
Subject: merge from debian branch
X-Git-Tag: userdir-ldap-0.3.24~5^2^2~8
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=fb2a20c640baae70d3977c0a1b66c9d81be206dd

merge from debian branch
---

fb2a20c640baae70d3977c0a1b66c9d81be206dd