Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Mon, 8 Apr 2013 02:23:19 +0000 (19:23 -0700)
committerHoward Chu <hyc@openldap.org>
Mon, 8 Apr 2013 02:23:19 +0000 (19:23 -0700)

Trivial merge