[hibernate-dev] ANN-572 revisited patch