commit fee0e897667141e3f52ecd613c4aae5eacf37594 Merge: 183874e ef39e27 Author: Tim Bielawa <tbielawa at redhat.com> Date: Fri Sep 7 11:25:49 2012 -0400 Merge branch 'f16' into f17 .gitignore | 1 + ansible.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) ---