ef0b68d Merge branch 'master' into el5

Merged and Committed by Luke Macken 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1