3ca6de4 sync w/devel for 4.2.2

Authored and Committed by rdieter 15 years ago
    sync w/devel for 4.2.2
    
        
file modified
+1 -5
file modified
+29 -12
file modified
+1 -1