[kdelibs/f16: 24/24] Merge remote-tracking branch 'master' into f16

[Rex Dieter]

commit fdd41f6c9bb4488cb0441775773b958af9280fdc
Merge: 399e027 2e3932f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 16:59:13 2012 -0600

    Merge remote-tracking branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	kdelibs.spec
    	sources

 .gitignore                                         |    6 +-
 ...currently-private-for-installing-missing-.patch |   76 +++++-----------
 ...ma-PackageMetadata-read-Match-the-behavio.patch |   59 ------------
 kdelibs-4.7.3-CVE-0046.patch                       |   16 ----
 kdelibs-4.7.97-respin.patch                        |   15 ---
 ...4.8.0-cmake_cxx_implicit_link_directories.patch |   22 +++++
 ...execdir.patch => kdelibs-4.8.0-libexecdir.patch |   34 ++++----
 kdelibs.spec                                       |   93 ++++++++++++--------
 sources                                            |    2 +-
 9 files changed, 125 insertions(+), 198 deletions(-)
---