[kdelibs/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Rex Dieter]

commit 371323bc2dcf4d71dfa259525050182d33de77bc
Merge: be5dcaf 82ae0f2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 27 10:03:13 2011 -0500

    Merge remote-tracking branch 'origin/f15' into f14

 kdelibs-4.6.4-kdoctools_docbook.patch |  395 +++++++++++++++++++++++++++++++++
 kdelibs.spec                          |    8 +-
 2 files changed, 402 insertions(+), 1 deletions(-)
---