[Zope-Checkins] CVS: Zope3/lib/python/Zope/StartUp - SiteDefinition.py:1.1.2.6

[Christian Theune]

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

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

=== Zope3/lib/python/Zope/StartUp/SiteDefinition.py 1.1.2.5 => 1.1.2.6 ===
 
 
-from Zope.App.OFS.Folder.RootFolder import RootFolder
+from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
 import asyncore, zLOG
 from Zope.Server import ZLogIntegration
 from Zope.Server.TaskThreads import ThreadedTaskDispatcher
@@ -156,7 +156,7 @@
 
         if app is None:
 
-            from Zope.App.OFS.Folder.RootFolder import RootFolder
+            from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
             from Transaction import get_transaction
         
             app = RootFolder()