[CMF-checkins] CVS: CMF/CMFDefault - Document.py:1.43

[Andrew Sawyers]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv12686/CMFDefault

Modified Files:
	Document.py 
Log Message:

*Fixed merge conflict typos 


=== CMF/CMFDefault/Document.py 1.42 => 1.43 ===
 from Products.CMFCore.WorkflowCore import WorkflowAction
 from Products.CMFCore.utils import _format_stx, keywordsplitter
+from DefaultDublinCoreImpl import DefaultDublinCoreImpl
 from utils import parseHeadersBody, formatRFC822Headers
 from utils import SimpleHTMLParser, bodyfinder, _dtmldir