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

[Rex Dieter]

commit b27295c7567d88ae1c72b7689105ae51fd164bf4
Merge: 2643d3e d4c4591
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:56:14 2012 -0500

    Merge branch 'master' into f16

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