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

[Rex Dieter]

commit fa3f36f2c0b498835479ac832766776c9615a6d9
Merge: 4cadde3 0eda0b7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:02:26 2012 -0500

    Merge branch 'f18' into f17

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