[kamera/f16: 11/11] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 1393cfe230fa5a94bc2dcc77680158ee551d2fcc
Merge: 37bc91a 65e5bb5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:21:42 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kamera.spec
    	sources

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