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

[Rex Dieter]

commit 3e7169cbe0dce72e87930e5ad8f8385dc6b67bd7
Merge: 07b2d9b 679f295
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:39:06 2011 -0500

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

 .gitignore   |    5 +----
 kdebase.spec |   17 ++++++-----------
 sources      |    3 +--
 3 files changed, 8 insertions(+), 17 deletions(-)
---