From: Howard Chu <hyc@openldap.org>
Date: Sun, 6 May 2012 02:42:30 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~944
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=326d07d8c6fa5e305e531d7914bf24c9db236fc0;p=thirdparty%2Fopenldap.git

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

326d07d8c6fa5e305e531d7914bf24c9db236fc0