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

[Rex Dieter]

commit 0537142d6580dfa303f508abd0854feedc1b0ff5
Merge: 201cd4a 07ca615
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:54:11 2012 -0500

    Merge branch 'master' into f16

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