8545ac6 Bring in sync with devel branch

Authored and Committed by oliver 16 years ago
    Bring in sync with devel branch
    
        
file modified
+26 -16
file modified
+1 -1