[kanagram/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 53385611ee7801b7afa27b4853982ba9a867c57b
Merge: 769c2d2 60ff856
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:14:34 2012 -0500

    Merge branch 'f17' into f16

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