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

[Rex Dieter]

commit 769c2d2e0338142e87412672d384f836fdcc67b7
Merge: b27295c 9ff4d94
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:54:23 2012 -0500

    Merge branch 'master' into f16

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