1880889 Refresh with latest version from upstream

Authored and Committed by beekhof 14 years ago
    Refresh with latest version from upstream
    
        
file modified
+1 -2
file modified
+11 -2
file modified
+1 -2