[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS - ofs.zcml:1.1.2.17

[Christian Theune]

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

Modified Files:
      Tag: Zope-3x-branch
	ofs.zcml 
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/ofs.zcml 1.1.2.16 => 1.1.2.17 ===
 >
 
-<include package=".ServiceManager" file="service-manager.zcml" />
 <include package=".Services" file="services.zcml" />
 <include package=".Content" file="content.zcml" />
 
 <include package=".ApplicationControl" file="application-control.zcml" />
-<include package=".RoleService" file="role-service.zcml" />
 
 <include package=".Introspector" file="introspector.zcml" />
 <include package=".Memento" file="memento.zcml" />