[CMF-checkins] CVS: CMF/CMFDefault - MembershipTool.py:1.22 SkinnedFolder.py:1.7

[Shane Hathaway]

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

Modified Files:
	MembershipTool.py SkinnedFolder.py 
Log Message:
Merged cmf-pre-1_3-branch


=== CMF/CMFDefault/MembershipTool.py 1.21 => 1.22 ===


=== CMF/CMFDefault/SkinnedFolder.py 1.6 => 1.7 ===
 from ComputedAttribute import ComputedAttribute
 from Products.CMFCore.utils import _getViewFor
+from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
 from Acquisition import aq_base
 
 factory_type_information = ( { 'id'             : 'Skinned Folder'
@@ -66,7 +67,8 @@
                            ,
                            )
 
-class SkinnedFolder( PortalFolder ):
+
+class SkinnedFolder(CMFCatalogAware, PortalFolder):
     """
     """
     meta_type = 'Skinned Folder'