924f625 Merge branch 'master' into el6

Merged and Committed by Brad Bell 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -3
file modified
+52 -25
file modified
+1 -1