commit a4838d00803c4c71a59ff83dfb7496919596174c Merge: 7938ab6 21f2450 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Aug 2 12:34:22 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kiten.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---