[kamera/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit f936bebbfd9dcd670674a14a76e637fd2df78529
Merge: 44315d2 873bba8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 7 12:44:27 2012 -0500

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

 .gitignore  |    3 +--
 kamera.spec |   27 +++++++++++++++++++++++++++
 sources     |    4 ++++
 3 files changed, 32 insertions(+), 2 deletions(-)
---
diff --cc kamera.spec
index 0df95f5,9311b55..d354c8e
--- a/kamera.spec
+++ b/kamera.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:    kamera
  Summary: Digital camera support for KDE 
++<<<<<<< HEAD
 +Version: 4.8.5
++=======
+ Version: 4.9.1
++>>>>>>> master
  Release: 1%{?dist}
  
  License: GPLv2
@@@ -55,11 -55,26 +59,34 @@@ make install/fast DESTDIR=%{buildroot} 
  
  
  %changelog
++<<<<<<< HEAD
 +* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.5-1
 +- 4.8.5
 +
 +* Mon Jun 04 2012 Than Ngo <than at redhat.com> - 4.8.4-1
 +- 4.8.4
++=======
+ * Mon Sep 03 2012 Than Ngo <than at redhat.com> - 4.9.1-1
+ - 4.9.1
+ 
+ * Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 4.9.0-1
+ - 4.9.0
+ 
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.97-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Thu Jul 12 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.97-1
+ - 4.8.97
+ 
+ * Thu Jun 28 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.95-1
+ - 4.8.95
+ 
+ * Sat Jun 09 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.90-1
+ - 4.8.90
+ 
+ * Fri Jun 01 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.80-1
+ - 4.8.80
++>>>>>>> master
  
  * Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.3-1
  - 4.8.3
diff --cc sources
index a657941,3584a0d..2d62630
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +bc248c66905c2f18c657df7158119c72  kamera-4.8.5.tar.xz
++=======
+ 9866306698ed24f8b91cd1e15343b844  kamera-4.9.1.tar.xz
++>>>>>>> master