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

[Rex Dieter]

commit 1c68937263bedd47165f48e2c4b02e3e8366c5e4
Merge: b24c5ce a0296f6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Dec 4 12:20:35 2011 -0600

    Merge branch 'f15' into f14

 kdebase.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---