[kanagram/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 2643d3e52627405e26ce949c22b1ec1efc67cb8b
Merge: 79d2c7a f5c9220
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:25:51 2012 -0600

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

 .gitignore    |    1 +
 kanagram.spec |   29 +++++++++++++++++++++++++----
 sources       |    2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)
---