[jboss-dev] Fixing JBAS-5908 on trunk