[kdelibs/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 0ebeb92f7c6692236f51be9e6f371857c1fc6274
Merge: ab9704d 05e9adc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 8 13:00:42 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore

 .gitignore                     |    6 +-
 kdelibs-4.6.1-dirlister.patch  |  389 ----------------------------------------
 kdelibs-4.6.1-kde#267770.patch |   43 -----
 kdelibs-4.6.1-kde264487.patch  |   75 --------
 kdelibs.spec                   |   17 +--
 sources                        |    2 +-
 6 files changed, 7 insertions(+), 525 deletions(-)
---