f28486c merge from devel

Authored and Committed by lkundrak 16 years ago
    merge from devel
    
        
file modified
+10 -1