[ansible/el6: 6/6] Merge branch 'master' into el6

[Timothy Bielawa]

commit 572a41200cff1f6c559c22501d5daa6d97b894c8
Merge: fd8de76 fee0e89
Author: Tim Bielawa <tbielawa at redhat.com>
Date:   Fri Sep 7 11:41:11 2012 -0400

    Merge branch 'master' into el6

 .gitignore   |    1 +
 ansible.spec |   12 ++++++++----
 sources      |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---