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

[Kevin Fenzi]

commit 7d8acccca74e2b97d98c25b33224814e631b552c
Merge: bced1ec 6a1b38a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Nov 27 17:05:10 2013 -0700

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

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