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

[Rex Dieter]

commit 05db4e6b0091c72601135b932da83ff49f5c4bc9
Merge: 49d7d0e 70d0e1c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:16:26 2012 -0500

    Merge branch 'f17' into f16

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