[kdegraphics/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit 0d1a7b34a055a46f1989f6a02d82e3a7b5c8c66f
Merge: 046d5b6 6f25e6d
Author: Than Ngo <than at redhat.com>
Date:   Thu Jul 7 10:11:38 2011 +0200

    Merge branch 'f15' into f14

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