[kamera/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit a1ecd4aef0e3e313d5a5f17238c7e64d3b9eb76e
Merge: 3c98e20 d053958
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:10:14 2013 -0500

    Merge branch 'master' into f19

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