[kamera/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 0327a9c86833f622b90b87e41a4e2c1df006ef48
Merge: 0537142 9e882bd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:14:15 2012 -0500

    Merge branch 'f17' into f16

 .gitignore  |    1 +
 kamera.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---