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

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

487d3966eea565e8768b5b7b06f1dca7181d467e