712161e 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 -6
file modified
+20 -17
file modified
+1 -1