0bc6323 sync with devel

Authored and Committed by mschwendt 18 years ago
    sync with devel
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+5 -2