Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Thu, 21 Feb 2013 05:20:20 +0000 (05:20 +0000)
committerHoward Chu <hyc@openldap.org>
Thu, 21 Feb 2013 05:20:20 +0000 (05:20 +0000)

Trivial merge