7b6a5ce Merge branch 'master' into el5

Merged and Committed by verdurin 13 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    
        
file removed
-1
file modified
+10 -3
file modified
+1 -1