[kdebase-workspace/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit aeadc9ef5d94d89522c556559b2132badcd364c8
Merge: a714119 be019dd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:31:33 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

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