commit c2e0e3d53fcf093ee2d5ad965567dfc9405d1054 Merge: 345b634 78dc860 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Mar 30 14:05:43 2012 -0500 Merge branch 'master' into f16 .gitignore | 1 + kstars.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---