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

[Rex Dieter]

commit 2cdc4690974082a87b7f88d141300fadd1398551
Merge: d8169f7 d21772a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 30 14:32:20 2011 -0500

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

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