[kdelibs/f14/master: 2/2] Merge remote branch 'origin/master' into f14/master

[Lukas Tinkl]

commit 315c746d049ab94441cc500120eaf69e4371964a
Merge: 8493938 ace57af
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Oct 5 14:29:41 2010 +0200

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

 kdelibs.spec |    5 ++++-
 sources      |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---