[kdebase-workspace/f14: 14/14] Merge branch 'f15' into f14

[Than Ngo]

commit 851e182d858f5a85298a3bc2efbd9aaf57b2d040
Merge: 252ebff e38556c
Author: Than Ngo <than at redhat.com>
Date:   Fri Jun 10 20:39:57 2011 +0200

    Merge branch 'f15' into f14
    
    Conflicts:
    	kdebase-workspace.spec

 .gitignore                                         |    1 +
 ...h => kdebase-workspace-4.6.4-nm-09-compat.patch |    2 +-
 kdebase-workspace.spec                             |   15 +++++---
 kdebase-workspce-4.6.3-kde272666.patch             |   38 --------------------
 sources                                            |    2 +-
 5 files changed, 12 insertions(+), 46 deletions(-)
---
diff --cc kdebase-workspace.spec
index 1472449,9ee1063..d295c70
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@@ -742,9 -738,12 +739,15 @@@ f
  
  
  %changelog
+ * Wed Jun 08 2011 Than Ngo <than at redhat.com> - 4.6.4-2
+ - rebase
+ 
+ * Mon Jun 06 2011 Than Ngo <than at redhat.com> - 4.6.4-1
+ - 4.6.4
+ 
 +* Thu May 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-9
 +- drop BR: libcaptury-devel
 +
  * Wed May 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-8
  - virtual desktop names are lost after log out (kde#272666)