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

[Rex Dieter]

commit 73c55f76e3acd3d7aa002c38d831c033358a3265
Merge: 91badd4 c723b02
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 7 10:56:37 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-settings
    
    Conflicts:
    	kde-settings.spec

 kde-settings.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc kde-settings.spec
index 7d5fb78,e2a2571..5cf7d18
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@@ -145,11 -153,9 +145,14 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Mon Mar 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6-6
 +- use lovelock-kdm-theme
 +- /var/log/kdm.log is never clean up (logrotate) (#682761)
 +- -kdm, move xterm dep to comps (#491251)
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6-4.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon Feb 07 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6-4
  - de-Laughlin-ize theming, be genericish/upstream (for now)
  - kcminputrc: theme=dmz-aa, Requires: dmz-cursor-themes (#675509)