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

[Rex Dieter]

commit 8cc0862ead8781becf859447328a239ddd58a19a
Merge: c2e0e3d adf12dd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 23:03:38 2012 -0500

    Merge branch 'master' into f16

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