2d03d03 Rebase to 2.7

Authored and Committed by Petr Machata 11 years ago
    Rebase to 2.7
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1