38b520 Merge branch 'f14'

Merged and Committed by Petr Machata 13 years ago
    Merge branch 'f14'
    
    Conflicts:
    	boost.spec
    
        
file modified
+24 -0