[kgeography/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit d67a56708488d82b6ec965b7a3796b901afecdb2
Merge: 6cba5e7 8b44a24
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:59:52 2012 -0500

    Merge branch 'master' into f16

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