[CMF-checkins] CVS: CMF/CMFDefault - Portal.py:1.25.2.1

[Andrew Sawyers]

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

Modified Files:
      Tag: CMF-1_2-branch
	Portal.py 
Log Message:

*merge CMFDecor into CMF


=== CMF/CMFDefault/Portal.py 1.25 => 1.25.2.1 ===
         ps.manage_addProduct['OFSP'].manage_addFolder(id='custom')
         ps.addSkinSelection('Basic',
-            'custom, topic, content, generic, control, Images',
+            'custom, zpt_topic, zpt_content, zpt_generic,'
+            + 'zpt_control, topic, content, generic, control, Images',
             make_default=1)
         ps.addSkinSelection('Nouvelle',
             'nouvelle, custom, topic, content, generic, control, Images')