f103aa5 Update to 2.4.2 (merge with master)

Authored and Committed by pghmcfc 13 years ago
    Update to 2.4.2 (merge with master)
    
        
file modified
+1 -0
file modified
+25 -5
file modified
+1 -1