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

[Rex Dieter]

commit 40abc429fc31976557d55e3cc6c70bac1bdf7825
Merge: 7d716e0 cbfc047
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:03:32 2012 -0500

    Merge branch 'f18' into f17

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