[kruler/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit ac108136cb85c4055b3278b98bc4cf1843d5b590
Merge: 4f2bfc2 0c48c66
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:22:58 2012 -0500

    Merge branch 'f17' into f16

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