[kdeplasma-addons: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdeplasma-addons

[Rex Dieter]

commit de4da1f83611018d9e5123b0a5ea20c0fb5e9f41
Merge: 602e4c2 b6dd0fc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Feb 28 12:04:20 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kdeplasma-addons
    
    Conflicts:
    	kdeplasma-addons.spec

 kdeplasma-addons.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc kdeplasma-addons.spec
index cebdb5f,7daf3e9..28bd528
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@@ -1,10 -1,10 +1,10 @@@
  Name:           kdeplasma-addons
 -Version:        4.6.0
 -Release:        3%{?dist}
+ Summary:        Additional plasmoids for KDE
 +Version:        4.6.1
 +Release:        1%{?dist}
- Summary:        Additional plasmoids for KDE
  
--Group:          User Interface/Desktops
  License:        GPLv2
++Group:          User Interface/Desktops
  URL:            http://www.kde.org/
  Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@@ -188,9 -188,9 +188,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Feb 28 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-1
 +- 4.6.1
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.0-2
  - Obsoletes/Provides: plasma-runner-events
  - drop old Obsoletes (f15+)