93524a3 Merge branch 'master' into f17

Merged and Committed by Petr Machata 11 years ago
    Merge branch 'master' into f17
    
        
file modified
+2 -0
file removed
-203
file removed
-2797
file removed
-1130
file modified
+68 -52
file modified
+1 -1