[kdebase/f13/master: 206/206] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 796dcd16e005d6b4937d6b01dfbbc4be1f4e32c6
Merge: 2719a12 efb02ca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 07:22:26 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdebase.spec
    	sources

 .gitignore                                       |    2 +-
 kdebase-4.3.4-bz#609039-chfn-parse.patch         |   37 +++++
 kdebase-4.4.1-kappfinder.patch                   |   13 --
 kdebase-4.5.2-folderview_sorting_kde227157.patch |   38 ++++++
 kdebase.spec                                     |  153 +++++++++-------------
 sources                                          |    2 +-
 6 files changed, 140 insertions(+), 105 deletions(-)
---