commit a4b670ba6527b5599d3d57c00eafdba4e3447ef9 Merge: 0327a9c 44315d2 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Aug 3 06:59:29 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + kamera.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---