From: Howard Chu <hyc@openldap.org>
Date: Wed, 28 Mar 2012 16:34:13 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~992
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8bbe985b8a3f03c0531744d6ddcd2ee43a9db1e;p=thirdparty%2Fopenldap.git

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

b8bbe985b8a3f03c0531744d6ddcd2ee43a9db1e