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

Hi there, I think we should do this again since there are some changes in master that I want to use in metamodel, and maybe we should do this regularly to minimize the conflicts? Steve is the best to do this, since he already did this once, but in case he is busying on other stuff, I'm voluntarily to do this . WDYT? ------------------------- Best Regards, Strong Liu <stliu at hibernate.org> http://about.me/stliu/bio