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

[Rex Dieter]

commit c8b1088152d558c0fc56a30574212e8473cd76eb
Merge: e4be8b2 f289df7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:26:39 2011 -0600

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

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