From: Howard Chu <hyc@openldap.org>
Date: Tue, 10 Apr 2012 22:42:43 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~959
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d806b970b1b91b4db5998aec7dd5ab610fbe590b;p=thirdparty%2Fopenldap.git

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

d806b970b1b91b4db5998aec7dd5ab610fbe590b