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

[Lukas Tinkl]

commit 8e9c51206d751f3bc1d4342874685c2b0b20ff63
Merge: 48ae933 14e0973
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Oct 5 14:37:28 2010 +0200

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

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