hibernate-distribution-3.5.6-Final-Matson

Fix multi thread problem in merge