[389-devel] Please review (take 3): #46 and #66