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

[Rex Dieter]

commit 45798081909aa57d925c933a360783670018e905
Merge: 770f85e 797ea47
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:21:26 2012 -0500

    Merge branch 'f17' into f16

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