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

[Kevin Fenzi]

commit 2a559d3cd39f2587f1ca5f7a7eb08eebc1fb4d14
Merge: 096facb c2a8c32
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Apr 2 19:44:26 2013 -0600

    Merge remote-tracking branch 'origin/master' into f18
    
    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