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

[Rex Dieter]

commit 8baa4ab87d4a6da7fcfb7b86ccd6b360a50d0446
Merge: c41ca60 df86e87
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 28 23:55:59 2010 -0500

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

 .gitignore                         |    2 +-
 kdelibs-4.5.1-knewstuff_gpg2.patch |   78 +++++++++++++++++++++++++++++++++
 kdelibs.spec                       |   83 +++++++++++++++++++++++++++++++++--
 sources                            |    2 +-
 4 files changed, 158 insertions(+), 7 deletions(-)
---