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

[Rex Dieter]

commit bd4bd6a98738a6be647dc57c0bd572befe468f59
Merge: 148c1e6 4d9fcb7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:02:02 2012 -0500

    Merge branch 'f18' into f17

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