[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ServiceManager - ServiceManager.py:1.1.2.12

[Christian Theune]

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

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

=== Zope3/lib/python/Zope/App/OFS/ServiceManager/ServiceManager.py 1.1.2.11 => 1.1.2.12 ===
 from Zope.ComponentArchitecture.GlobalServiceManager import InvalidService
 from Zope.Exceptions import NotFoundError, ZopeError
-from Zope.App.OFS.Folder.Folder import Folder
+from Zope.App.OFS.Content.Folder.Folder import Folder
 from Zope.ContextWrapper import ContextMethod
 from Zope.Proxy.ContextWrapper import ContextWrapper
 from Zope.App.OFS.Container.BTreeContainer import BTreeContainer