Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Sun, 30 Sep 2012 14:50:56 +0000 (07:50 -0700)
committerHoward Chu <hyc@openldap.org>
Sun, 30 Sep 2012 14:50:56 +0000 (07:50 -0700)

Trivial merge