commit 618f9c15230f3f784c864c9e9116e2a2efa90c13 Merge: cff4c4e 6ed60d2 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Aug 2 12:30:47 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kstars.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---