6fede73 Merge branch 'f15' into f16

Merged and Committed by Petr Machata 12 years ago
    Merge branch 'f15' into f16
    
        
file modified
+6 -1