d5ee7f Merge branch 'f16'

Merged and Committed by Petr Machata 12 years ago
    Merge branch 'f16'
    
    Conflicts:
    	boost.spec
    
        
file modified
+9 -1