[hibernate-dev] ORM progress: tricky branch state