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

[Rex Dieter]

commit 6cba5e7108e9e47cacace1888640e0e010757307
Merge: d3cf067 172b8dc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:01:53 2012 -0500

    Merge branch 'master' into f16

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