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

[Kevin Fenzi]

commit 899aa249831dca4d9f896800fc2e082f41b22e1d
Merge: a390ac4 1869e0c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Sep 13 16:57:57 2013 -0600

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

 .gitignore   |    1 +
 ansible.spec |   51 +++++++++++++++++----------------------------------
 sources      |    2 +-
 3 files changed, 19 insertions(+), 35 deletions(-)
---