85e579c Pull from devel

Authored and Committed by lkundrak 14 years ago
    Pull from devel
    
        
file modified
+33 -8