49cf6ef Merge remote branch 'origin/f14/master' into f14/master

Merged and Committed by Petr Machata 13 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge remote branch 'origin/f14/master' into f14/master
    
    Conflicts:
    	make.spec
    
        
file modified
+3 -0