am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac': Use reentrant lock for main dictionaries. DO NOT MERGEmain
commit
2f14418c31
* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac': Use reentrant lock for main dictionaries. DO NOT MERGEmain