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

[Rex Dieter]

commit 1f2c6e76a64f4568f65499f9827f9a9c6a5d54f3
Merge: 6fa30d1 5b83a8f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:18:54 2012 -0500

    Merge branch 'f17' into f16

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