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

[Rex Dieter]

commit d8d314332e343094a658df8ec879314ef7b5b009
Merge: d257a50 6ff196b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:01:40 2012 -0500

    Merge branch 'master' into f16

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