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

[Kevin Fenzi]

commit bced1ec52a1443df6e5c49f181f07b0d42fd3a34
Merge: 33bf8d5 c10ee8c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Nov 21 13:59:30 2013 -0700

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

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