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

[Than Ngo]

commit cffd9075f4a22ab09067e1b86358bbb8b6ae6410
Merge: 00403c3 a23e275
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:35:40 2012 +0100

    Merge branch 'f18' into f17

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