139c102 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 -1
file modified
+23 -10
file modified
+1 -1