ab5780a Merge branch 'master' into el4

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file modified
+31 -1
file modified
+1 -1