[hibernate-dev] Back to trunk for Annotations and co