d9c7c20 Sync with devel

Authored and Committed by supercyper 13 years ago
    Sync with devel
    
        
file modified
+1 -1
file modified
+89 -69
file modified
+2 -2