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

[Rex Dieter]

commit f09bae03447b0a89b2d89bb0ceea7344a562e5dc
Merge: 01333ea 29e3360
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:02:14 2012 -0500

    Merge branch 'f18' into f17

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