21ed39b sync witht devel

Authored and Committed by pertusus 16 years ago
    sync witht devel
    
        
file modified
+6 -1