May I merge branches/plone-2.5-3.0-compat into trunk? It makes membrane compatible under both Plone 2.5/Zope 2.9 and Plone 3.0/Zope 2.10. Ross