[kactivities/f17: 15/15] Merge branch 'master' into f17

[Rex Dieter]

commit da7aa97c9b36d7610e5e7fb72042d7d921f8dcb1
Merge: 4834a7e 82fc569
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 14:42:14 2012 -0500

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

 .gitignore       |    3 +--
 kactivities.spec |   46 +++++++++++++++++++++++++++++++++++++++++-----
 sources          |    4 ++++
 3 files changed, 46 insertions(+), 7 deletions(-)
---
diff --cc kactivities.spec
index 3f31308,2b4b6e9..a6a18ac
--- a/kactivities.spec
+++ b/kactivities.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:    kactivities
  Summary: API for using and interacting with Activities 
++<<<<<<< HEAD
 +Version: 4.8.5
++=======
+ Version: 4.9.1
++>>>>>>> master
  Release: 1%{?dist}
  
  License: GPLv2+ and LGPLv2+
@@@ -82,11 -88,29 +92,37 @@@ 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
+ 
+ * Wed Jul 11 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.97-1
+ - 4.8.97
+ 
+ * Wed Jun 27 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.95-1
+ - 4.8.95
+ 
+ * Fri Jun 08 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.90-1
+ - 4.8.90
+ 
+ * Fri Jun 01 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.80-2
+ - respin
+ 
+ * Fri May 25 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 8115dbf,c810a7b..3ff907c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +122210ba323efd9d465b87fd07d6dcbb  kactivities-4.8.5.tar.xz
++=======
+ 41d8fc71098b66efb853a9bb70b8aed3  kactivities-4.9.1.tar.xz
++>>>>>>> master