6b3800f merge in rhel-6-ificiation

Authored and Committed by caolanm 12 years ago
    merge in rhel-6-ificiation
    
        
file modified
+222 -110