788a3a2 Sync with devel

Authored and Committed by supercyper 14 years ago
    Sync with devel
    
        
file modified
+15 -15
file modified
+15 -13
file modified
+1 -1