[kanagram/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit cb07859d1ae617c8333d0df0f2d083e0c1c915a7
Merge: 3f0579b c6ebdbb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 14:29:56 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kanagram.spec
    	sources

 .gitignore    |    3 +-
 kanagram.spec |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 55 insertions(+), 9 deletions(-)
---