[kgamma/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit d257a50d8251514841615f2a9d13efc5492f8616
Merge: 73b6e7a 0beca05
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:39:15 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kgamma.spec
    	sources

 .gitignore  |    3 +--
 kgamma.spec |   31 ++++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)
---