5884cf4 Merge branch 'el6'

Merged and Committed by ralph 11 years ago
    Merge branch 'el6'
    
    Conflicts:
    	python-zope-component.spec
    
        
file modified
+0 -1
file modified
+7 -3