5b3d8c4 Merge branch 'master' into el5

Merged and Committed by nb 12 years ago
    Merge branch 'master' into el5
    
        
file modified
+1 -1
file modified
+48 -4