commit 00403c3e9a3eb1786f55831510667be368c2c5da Merge: 98308ff fe18d10 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 20:31:22 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + kamera.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---