27738ba rebase to latest upstream 1.6.11

Authored and Committed by Jiri Skala 12 years ago
    rebase to latest upstream 1.6.11
    
        
file modified
+1 -0
file modified
+7 -19
file modified
+7 -9
file modified
+1 -1