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

[Than Ngo]

commit 3ad4851e2892bdcf435505001027ba1308d6c21f
Merge: 8914fa2 ab14a24
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:58:07 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kamera.spec
    	sources

 .gitignore  |    1 +
 kamera.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index f0261df,3ef90f1..0129318
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kamera-4.8.5.tar.xz
 +/kamera-4.9.1.tar.xz
 +/kamera-4.9.2.tar.xz
 +/kamera-4.9.3.tar.xz
 +/kamera-4.9.4.tar.xz
 +/kamera-4.9.5.tar.xz
+ /kamera-4.10.1.tar.xz