[kgeography/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 01333ea5dd96751c7f672bb1eb019863aa15a624
Merge: faa2154 c29ce7a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:35:57 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kgeography.spec
    	sources

 .gitignore      |    3 +--
 kgeography.spec |   25 ++++++++++++++++++++-----
 sources         |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---