[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication - ZopePublication.py:1.1.2.39

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication
In directory cvs.zope.org:/tmp/cvs-serv3937/lib/python/Zope/App/ZopePublication

Modified Files:
      Tag: Zope-3x-branch
	ZopePublication.py 
Log Message:
Completing OFS.Folder -> OFS.Content.Folder by merging 'ctheune-foldermove-branch' into Zope-3x-branch

=== Zope3/lib/python/Zope/App/ZopePublication/ZopePublication.py 1.1.2.38 => 1.1.2.39 ===
 
 from ZODB.POSException import ConflictError
-from Zope.App.OFS.Folder.RootFolder import RootFolder
+from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
 from PublicationTraverse import PublicationTraverse
 
 from Zope.Security.Checker import ProxyFactory