[kdelibs/f16: 7/7] Merge branch 'master' into f16

[Rex Dieter]

commit 12c8e1938bb6bb3a9695689e029afd020aa3c80e
Merge: 6de5a52 ca3920c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 4 13:53:27 2011 -0500

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

 ...utomatic-scanning-of-source-code-for-requ.patch |   57 +++++++++-----
 kdelibs.spec                                       |   81 ++++++++++++--------
 2 files changed, 83 insertions(+), 55 deletions(-)
---