Conflicts:
	Products/PortalTransforms/Extensions/Install.py
	Products/PortalTransforms/HISTORY.txt
	Products/PortalTransforms/Transform.py
	Products/PortalTransforms/TransformEngine.py
	Products/PortalTransforms/chain.py
	Products/PortalTransforms/configure.zcml
	Products/PortalTransforms/data.py
	Products/PortalTransforms/interfaces.py
	Products/PortalTransforms/libtransforms/commandtransform.py
	Products/PortalTransforms/libtransforms/piltransform.py
	Products/PortalTransforms/libtransforms/retransform.py
	Products/PortalTransforms/tests/test_engine.py
	Products/PortalTransforms/tests/test_transforms.py
	Products/PortalTransforms/transforms/broken.py
	Products/PortalTransforms/transforms/html_body.py
	Products/PortalTransforms/transforms/identity.py
	Products/PortalTransforms/transforms/image_to_html.py
	Products/PortalTransforms/transforms/lynx_dump.py
	Products/PortalTransforms/transforms/markdown_to_html.py
	Products/PortalTransforms/transforms/pdf_to_html.py
	Products/PortalTransforms/transforms/pdf_to_text.py
	Products/PortalTransforms/transforms/python.py
	Products/PortalTransforms/transforms/rest.py
	Products/PortalTransforms/transforms/rtf_to_html.py
	Products/PortalTransforms/transforms/rtf_to_xml.py
	Products/PortalTransforms/transforms/safe_html.py
	Products/PortalTransforms/transforms/st.py
	Products/PortalTransforms/transforms/text_pre_to_html.py
	Products/PortalTransforms/transforms/text_to_html.py
	Products/PortalTransforms/transforms/textile_to_html.py
	Products/PortalTransforms/transforms/word_to_html.py
	Products/PortalTransforms/unsafe_transforms/command.py
	Products/PortalTransforms/unsafe_transforms/xml.py
	Products/PortalTransforms/utils.py
	Products/PortalTransforms/version.txt

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41725 20353a03-c40f-0410-a6d1-a30d3c3de9de