fb7aa65 Merge from devel

Authored and Committed by lkundrak 16 years ago
    Merge from devel
    
        
file modified
+30 -4