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

[Timothy Bielawa]

commit 68a4583df346846f7cd7e0258dbf83a76477d064
Merge: d0d8d93 7109b73
Author: Tim Bielawa <tbielawa at redhat.com>
Date:   Wed Oct 24 14:20:45 2012 -0400

    Merge branch 'master' into el6

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