bbf8f4b Merge remote branch 'origin/el6' into el5

Merged and Committed by robert 8 years ago
    Merge remote branch 'origin/el6' into el5
    
        
file modified
+6 -3
file modified
+2 -2