11251a4 Merge branch 'master' into el5

Merged and Committed by nb 13 years ago
    Merge branch 'master' into el5
    
        
file modified
+1 -0
file modified
+17 -3
file modified
+1 -1