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

[Than Ngo]

commit 3041b38d25c3c8c4aba6efbeaf91fe9fd11dc0a7
Merge: fc74710 3e245d2
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:36:03 2012 +0100

    Merge branch 'f18' into f17

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