so merge from the bsddb-bsddb3-schizo-branch back to the trunk.
Attach a file by drag & drop or click to upload