MarshalException when saving VDB with both "other" files and data roles

If I have a VDB which contains both data roles and an "other" type file, I get an exception like this:
Warning 2010-10-29 14:09:02.828 Save Failed
java.lang.RuntimeException: javax.xml.bind.MarshalException

• with linked exception:
  [org.xml.sax.SAXParseException: cvc-complex-type.2.4.a: Invalid content was found starting with element 'data-role'. One of ' {entry}' is expected.]
  at com.metamatrix.core.modeler.CoreModelerPlugin.toRuntimeException(CoreModelerPlugin.java:75)
  at com.metamatrix.core.modeler.util.OperationUtil.perform(OperationUtil.java:48)
  at org.teiid.designer.vdb.Vdb.save(Vdb.java:402)
  at com.metamatrix.modeler.internal.vdb.ui.editor.VdbEditor.doSave(VdbEditor.java:877)
  at org.eclipse.ui.internal.SaveableHelper$2.run(SaveableHelper.java:151)
  at org.eclipse.ui.internal.SaveableHelper$5.run(SaveableHelper.java:277)
  at org.eclipse.jface.operation.ModalContext.runInCurrentThread(ModalContext.java:464)
  at org.eclipse.jface.operation.ModalContext.run(ModalContext.java:372)
  at org.eclipse.jface.window.ApplicationWindow$1.run(ApplicationWindow.java:759)
  at org.eclipse.swt.custom.BusyIndicator.showWhile(BusyIndicator.java:70)
  at org.eclipse.jface.window.ApplicationWindow.run(ApplicationWindow.java:756)
  at org.eclipse.ui.internal.WorkbenchWindow.run(WorkbenchWindow.java:2600)
  at org.eclipse.ui.internal.SaveableHelper.runProgressMonitorOperation(SaveableHelper.java:285)
  at org.eclipse.ui.internal.SaveableHelper.runProgressMonitorOperation(SaveableHelper.java:264)
  at org.eclipse.ui.internal.SaveableHelper.savePart(SaveableHelper.java:156)
  at org.eclipse.ui.internal.EditorManager.savePart(EditorManager.java:1369)
  at org.eclipse.ui.internal.WorkbenchPage.savePart(WorkbenchPage.java:3334)
  at org.eclipse.ui.internal.WorkbenchPage.saveEditor(WorkbenchPage.java:3347)
  at org.eclipse.ui.internal.SaveAction.run(SaveAction.java:76)
  at org.eclipse.jface.action.Action.runWithEvent(Action.java:498)
  at org.eclipse.jface.action.ActionContributionItem.handleWidgetSelection(ActionContributionItem.java:584)
  at org.eclipse.jface.action.ActionContributionItem.access$2(ActionContributionItem.java:501)
  at org.eclipse.jface.action.ActionContributionItem$6.handleEvent(ActionContributionItem.java:452)
  at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:84)
  at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1053)
  at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java:4066)
  at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3657)
  at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2640)
  at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:2604)
  at org.eclipse.ui.internal.Workbench.access$4(Workbench.java:2438)
  at org.eclipse.ui.internal.Workbench$7.run(Workbench.java:671)
  at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332)
  at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:664)
  at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149)
  at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:115)
  at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196)
  at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
  at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
  at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:369)
  at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
  at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
  at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
  at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
  at java.lang.reflect.Method.invoke(Unknown Source)
  at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:619)
  at org.eclipse.equinox.launcher.Main.basicRun(Main.java:574)
  at org.eclipse.equinox.launcher.Main.run(Main.java:1407)
  Caused by: javax.xml.bind.MarshalException
  - with linked exception:
  [org.xml.sax.SAXParseException: cvc-complex-type.2.4.a: Invalid content was found starting with element 'data-role'. One of '{entry}

  ' is expected.]
  at com.sun.xml.internal.bind.v2.runtime.MarshallerImpl.write(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.MarshallerImpl.marshal(Unknown Source)
  at javax.xml.bind.helpers.AbstractMarshallerImpl.marshal(Unknown Source)
  at org.teiid.designer.vdb.Vdb$2.tryToDo(Vdb.java:431)
  at com.metamatrix.core.modeler.util.OperationUtil.perform(OperationUtil.java:38)
  ... 45 more
  Caused by: org.xml.sax.SAXParseException: cvc-complex-type.2.4.a: Invalid content was found starting with element 'data-role'. One of '

  {entry}

  ' is expected.
  at com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper.createSAXParseException(Unknown Source)
  at com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper.error(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.XMLErrorReporter.reportError(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.XMLErrorReporter.reportError(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator$XSIErrorReporter.reportError(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator.reportSchemaError(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator.handleStartElement(Unknown Source)
  at com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator.startElement(Unknown Source)
  at com.sun.org.apache.xerces.internal.jaxp.validation.ValidatorHandlerImpl.startElement(Unknown Source)
  at org.xml.sax.helpers.XMLFilterImpl.startElement(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.output.SAXOutput.endStartTag(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.output.ForkXmlOutput.endStartTag(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.XMLSerializer.endAttributes(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.XMLSerializer.childAsXsiType(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.property.ArrayElementNodeProperty.serializeItem(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.property.ArrayElementProperty.serializeListBody(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.property.ArrayERProperty.serializeBody(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl.serializeBody(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.XMLSerializer.childAsSoleContent(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl.serializeRoot(Unknown Source)
  at com.sun.xml.internal.bind.v2.runtime.XMLSerializer.childAsRoot(Unknown Source)
  ... 50 more