[kstars/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 345b63492b2d2184be9afea9b006b68c7aaf6f3c
Merge: b99bae4 a1dab51
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:51:07 2012 -0600

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

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