6baf46f Merge branch 'master' into el6

Merged and Committed by pghmcfc 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file modified
+84 -39
file modified
+1 -1