[kdelibs/f14: 6/6] Merge branch 'f15' into f14

[Rex Dieter]

commit 23f8a38cade07fce9c5a1e15f06aa591caf9f9c7
Merge: 2722e31 6ab5508
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 11 10:51:43 2011 -0500

    Merge branch 'f15' into f14

 kdelibs-4.3.1-drkonq.patch             |   12 ------
 kdelibs-4.6.5-CVE-2011-3365-kio.patch  |   61 ++++++++++++++++++++++++++++++++
 kdelibs-4.6.5-CVE-2011-3365-kssl.patch |   25 +++++++++++++
 kdelibs.spec                           |   52 ++++++++++++++++++++-------
 4 files changed, 125 insertions(+), 25 deletions(-)
---