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

[Rex Dieter]

commit cb44453be8b253dc346fe7a72d4427b0399dc869
Merge: 851e182 743b6ef
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:27:59 2011 -0500

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

 .gitignore             |    4 +---
 kdebase-workspace.spec |    7 +++++--
 sources                |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---