06974e3 Merge from devel

Authored and Committed by lkundrak 14 years ago
    Merge from devel
    
        
file modified
+8 -2
file modified
+1 -1