dd1691 Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by Kevin Fenzi 11 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	ansible.spec
    	sources
    
        
file modified
+1 -9
file modified
+11 -5
file modified
+1 -1