6a0d4dd Merge branch 'master' into el5

Merged and Committed by pali 13 years ago
    Merge branch 'master' into el5
    
        
file modified
+1 -0
file added
+10
file modified
+20 -4
file modified
+1 -1