ccbdcb6 Merge branch 'f14/master'

Merged and Committed by Petr Machata 13 years ago
    Merge branch 'f14/master'
    
    Conflicts:
    	make.spec
    
        
file modified
+8 -1