[kdelibs/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit 66831870e81f0f03ded8cad0603dd4b1e25b93a4
Merge: 0b5ef7c a567e2c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 11 15:45:55 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	kdelibs.spec

 kdelibs-4.4.80-icon-name-qt47.patch |   18 ------------------
 kdelibs.spec                        |   13 ++++++++++---
 2 files changed, 10 insertions(+), 21 deletions(-)
---