[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser - FolderContents.py:1.1.4.3

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv26313/lib/python/Zope/App/OFS/Content/Folder/Views/Browser

Modified Files:
      Tag: Zope-3x-branch
	FolderContents.py 
Log Message:
Merged the ctheune-services_move-branch to Zope-3x-branch

- Moved Zope.App.OFS.ServiceManager into the Zope.App.OFS.Services package
- Moved Zope.App.OFS.RoleService into the Zope.App.OFS.Services package



=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/FolderContents.py 1.1.4.2 => 1.1.4.3 ===
 
 from Zope.App.PageTemplate import ViewPageTemplateFile
-from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
+from Zope.App.OFS.Services.ServiceManager.ServiceManager import ServiceManager
 from Zope.App.OFS.Container.Views.Browser.Contents import Contents
 
 class FolderContents(Contents):