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

[Rex Dieter]

commit ea54f45b94c841c3834dd3980a998b1ec8e626ea
Merge: ac10813 cef5a57
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:26:41 2012 -0500

    Merge branch 'f17' into f16

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