b94a338 Merge branch 'f21'

Merged and Committed by Timothy St. Clair 6 years ago
    Merge branch 'f21'
    
    Conflicts:
    	apache-commons-collections.spec
    
        
file added
+148