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

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

55060f6b1f23c6e4276d8e10ef73eaf1f2a3ab3a