Re: [hibernate-dev] merge master into metamodel branch, again :)