Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Tue, 30 Jul 2013 20:48:01 +0000 (13:48 -0700)
committerHoward Chu <hyc@openldap.org>
Tue, 30 Jul 2013 20:48:01 +0000 (13:48 -0700)

Trivial merge