Jesper, you've taken this task from me? I'm going to take it back.
I've synched up all the fixes/changes from 4.2 into head except the resource adapters.
Basically what's left to do is porting the last two subtasks of this:
http://jira.jboss.com/jira/browse/JBAS-5083
Thanks, Adrian !
I port the http://jira.jboss.com/jira/browse/JBAS-5083 and http://jira.jboss.com/jira/browse/JBAS-5084 tasks to trunk.