b9624d5 sync with devel, ver. 3.1.6

Authored and Committed by kasal 15 years ago
    sync with devel, ver. 3.1.6
    
        
file modified
+1 -2
file removed
-35
file removed
-255
file removed
-204
file removed
-299
file removed
-40
file modified
+18 -47
file modified
+1 -2