dd1691
Merge remote-tracking branch 'origin/master' into el6 Conflicts: .gitignore ansible.spec sources