de2b047 Merge from devel

Authored and Committed by lkundrak 15 years ago
    Merge from devel
    
        
file modified
+12 -5
file modified
+1 -1