[kgeography/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit eebe538d23d9db12ebabd165956c67105e4e580a
Merge: 3041b38 09585b1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:48:38 2012 -0600

    Merge branch 'f18' into f17

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