[kstars/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 4781940cc6f5cd2652f4a512c8a55eec23e5df02
Merge: 431c454 29e78be
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:09:53 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kstars.spec
    	sources

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