From: Howard Chu <hyc@openldap.org>
Date: Tue, 21 Feb 2012 19:52:44 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1026
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa33f4b220924d9b054c5acbce3440dadef41a27;p=thirdparty%2Fopenldap.git

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

aa33f4b220924d9b054c5acbce3440dadef41a27