94c2104 sync with devel/

Authored and Committed by Lukas Tinkl 14 years ago
    sync with devel/
    
        
file modified
+94 -47