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

[Kevin Fenzi]

commit 5b61f8f3ecbc71b4ce7e9cd2931d1bc3f5d4e03d
Merge: 2a559d3 6301504
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Jun 10 19:35:06 2013 -0600

    Merge remote-tracking branch 'origin/master' into f18

 .gitignore   |    1 +
 ansible.spec |   24 ++++++++++++------------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index 74bdca1,f1fc614..97f0c2a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,11 +1,2 @@@
 -/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
+ /ansible-1.2.tar.gz