[kstars/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit cff4c4e4c3a685c6b29e1547dec3a945ac9c1b29
Merge: 8cc0862 7732e80
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:23:44 2012 -0500

    Merge branch 'f17' into f16

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