commit 149ff3b51749b968d0a641ce9e99e91a89558235 Merge: 6b7d014 faa2154 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Aug 3 07:17:16 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kgeography.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---