Merge remote-tracking branch 'origin/mdb.master'
authorHoward Chu <hyc@openldap.org>
Wed, 9 Jan 2013 20:22:41 +0000 (12:22 -0800)
committerHoward Chu <hyc@openldap.org>
Wed, 9 Jan 2013 20:22:41 +0000 (12:22 -0800)

Trivial merge