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

[Rex Dieter]

commit 201cd4adfab5e93c8ba63cbc06118f832c6e60df
Merge: 1393cfe 8b6961d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:56:01 2012 -0500

    Merge branch 'master' into f16

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