From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 16 May 2008 18:56:53 +0000 (+0200)
Subject: Merge from -common branch
X-Git-Tag: userdir-ldap-0.3.24~5^2^2
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=a9ebb6f2afbf0fbc0e94ab73726dedb6a8ae5d75

Merge from -common branch
---

a9ebb6f2afbf0fbc0e94ab73726dedb6a8ae5d75