1ed50c9 synchronize with f12 branch

Authored and Committed by Nikola Pajkovsky 14 years ago
    synchronize with f12 branch
    
        
file modified
+2 -2
file modified
+12 -5