[kgeography/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit d3cf067c1e5c75ed7bf1bf31b52ecc388aa65522
Merge: 9d59d26 a41e0b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:40:00 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kgeography.spec
    	sources

 .gitignore      |    3 +--
 kgeography.spec |   30 ++++++++++++++++++++++++++----
 sources         |    2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)
---