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

[Rex Dieter]

commit 6b7d014684095fefba30ed3215daa27dddc8e441
Merge: d67a567 8ab50be
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:20:28 2012 -0500

    Merge branch 'f17' into f16

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