[kdebase/f14: 2/2] Merge branch 'f15' into f14

[Rex Dieter]

commit b24c5ceb50f95006a4d3063eaf4621c032ac85c4
Merge: 3e7169c c6f4eba
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 21 11:30:10 2011 -0500

    Merge branch 'f15' into f14

 kdebase-konsole_link_underline.patch |  174 ++++++++++++++++++++++++++++++++++
 kdebase.spec                         |   11 ++-
 2 files changed, 184 insertions(+), 1 deletions(-)
---