7cabf7a Merge branch 'master' into el6

Merged and Committed by orion 11 years ago
    Merge branch 'master' into el6
    Update to 2.2.5
    
        
file modified
+1 -3
file modified
+17 -2
file modified
+1 -1