[ansible/el6: 4/4] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit dd169184d8847befcd87f255b986a312177a9b06
Merge: 6c450e3 c2a8c32
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Apr 2 19:50:05 2013 -0600

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

 .gitignore   |   10 +---------
 ansible.spec |   16 +++++++++++-----
 sources      |    2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index cada7b1,1dd331f..74bdca1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,9 -1,10 +1,1 @@@
--/ansible-0.3.1.tar.gz
--/ansible-0.4.1.tar.gz
--/ansible-0.5.1.tar.gz
--/ansible-0.6.tar.gz
--/ansible-0.7.tar.gz
--/ansible-0.7.1.tar.gz
--/ansible-0.8.tar.gz
--/ansible-0.9.tar.gz
--/ansible-1.0.tar.gz
+ /ansible-1.1.tar.gz