b9a3b9 Merge branch 'master' into f17

Merged and Committed by Karel Klic 12 years ago
    Merge branch 'master' into f17
    
        
file modified
+1 -0
file modified
+21 -17
file modified
+1 -1