From: Howard Chu <hyc@openldap.org>
Date: Sun, 18 Sep 2011 20:25:09 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e76299c196bb93fd2e3ca7972260aa55f9c1a796;p=thirdparty%2Fopenldap.git

Merge remote branch 'origin/mdb.master'
---

e76299c196bb93fd2e3ca7972260aa55f9c1a796