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

[Rex Dieter]

commit 37a4c8136f1d70972abf348f7ade8fe51ee8eaef
Merge: d8d3143 3e9735c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:59:41 2012 -0500

    Merge branch 'master' into f16

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