8005c2c Merge branch 'master' into el5

Merged and Committed by Luke Macken 12 years ago
    Merge branch 'master' into el5
    
        
file modified
+2 -0
file modified
+16 -3
file modified
+1 -1