debf660 Merging in changes from el6 branch and updating to 3.4.2

Authored and Committed by daveisfera 9 years ago
    Merging in changes from el6 branch and updating to 3.4.2
    
        
file modified
+61 -22
file modified
+2 -2