From: Howard Chu <hyc@openldap.org>
Date: Sat, 3 Mar 2012 01:28:51 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1015
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;p=thirdparty%2Fopenldap.git

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

9547dd7a0d9fd079e6e75fb59b20a2fc661c9782