[Zope-Checkins] CVS: Zope2 - ObjectManager.py:1.114

[evan@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/OFS
In directory serenade.digicool.com:/home/evan/bugfix/lib/python/OFS

Modified Files:
	ObjectManager.py 
Log Message:
Merge ObjectManager into trunk