ddc5850 Merge branch 'el6' into el5

Merged and Committed by limb 9 years ago
    Merge branch 'el6' into el5
    
        
file modified
+5 -2
file modified
+2 -2