c4b7549 sync with devel

Authored and Committed by supercyper 13 years ago
    sync with devel
    
        
file removed
-1
file modified
+25 -27
file modified
+1 -0
file modified
+1 -1