Update of /cvs-repository/Zope3/src/zope/app/contentdirective In directory cvs.zope.org:/tmp/cvs-serv3664/src/zope/app/contentdirective Modified Files: contentdirective.py Log Message: Merging paris-copypasterename-branch. Not very fun :( === Zope3/src/zope/app/contentdirective/contentdirective.py 1.6 => 1.7 ===