c41b2da sync w/devel

Authored and Committed by rdieter 16 years ago
    sync w/devel
    
        
file modified
+1 -3
file modified
+26 -9
file modified
+1 -1