65524f4 Rebase to 20110908

Authored and Committed by Petr Machata 12 years ago
    Rebase to 20110908
    
        
file modified
+1 -0
file modified
+8 -2
file modified
+1 -1