8f0d485 sync with devel/

Authored and Committed by Lukas Tinkl 15 years ago
    sync with devel/
    
        
file modified
+5 -2
file modified
+1 -1