68d8e51 Merge branch 'master' into el5

Merged and Committed by pali 13 years ago
    Merge branch 'master' into el5
    
        
file modified
+3 -2
file modified
+8 -11