324d73c Rebase to 20120115

Authored and Committed by Petr Machata 12 years ago
    Rebase to 20120115
    - Resolves: #782010
    
        
file modified
+1 -0
file modified
+5 -1
file modified
+1 -1