7cfc404 sync w/devel

Authored and Committed by rdieter 15 years ago
    sync w/devel
    
        
file modified
+8 -4