merge hibernate4 into trunk (2nd step)