Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Mon, 15 Jul 2013 00:20:14 +0000 (17:20 -0700)
committerHoward Chu <hyc@openldap.org>
Mon, 15 Jul 2013 00:20:14 +0000 (17:20 -0700)

Trivial merge