ec76851 Merge branch 'master' into el5

Merged and Committed by nb 12 years ago
    Merge branch 'master' into el5
    
        
file modified
+2 -0
file modified
+8 -2
file modified
+1 -1