7f45750 sync with devel

Authored and Committed by pertusus 16 years ago
    sync with devel
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+42 -12