[kamera/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 70492bc7db6f566e20ef1bda32c9e444c6e4b301
Merge: 13cceed 3ad4851
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 08:57:44 2013 -0600

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 kamera.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---