[Zope-Checkins] CVS: Zope2 - content_types.py:1.11

[Brian Lloyd]

Update of /cvs-repository/Zope2/lib/python/OFS
In directory korak.digicool.com:/home/brian/temp/zope_trunk/lib/python/OFS

Modified Files:
	content_types.py 
Log Message:
Merged fix for ignoring passed in content type from 2.2 branch