A merge of an ejb2.1 descriptor with a 4.0 jboss descriptor with 2 session and 1 entity beans is failing with:

java.lang.ClassCastException: org.jboss.metadata.ejb.spec.EntityBeanMetaData
at org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData.merge(JBossSessionBeanMetaData.java:820)
at org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData.merge(JBossEnterpriseBeansMetaData.java:153)
at org.jboss.metadata.ejb.jboss.JBossMetaData.merge(JBossMetaData.java:722)
at org.jboss.test.metadata.ejb.EjbJar21UnitTestCase.testMultipleMerge(EjbJar21UnitTestCase.java:131)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)