commit 01c01c75f41aafb59e92a5cac9c6415a50a322d6 Merge: c14764a 9fc0d2e Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 20:12:29 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + cantor.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---