acd528b version 1.1.12 - Merge branch 'el6' into el5

Merged and Committed by rmeggins 13 years ago
    version 1.1.12 - Merge branch 'el6' into el5
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1