Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Fri, 14 Sep 2012 13:52:37 +0000 (06:52 -0700)
committerHoward Chu <hyc@openldap.org>
Fri, 14 Sep 2012 13:52:37 +0000 (06:52 -0700)

Trivial merge