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

[Than Ngo]

commit 2419188f00eb8138c458ff475118f2adc3105edd
Merge: bad9927 1b267ca
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:00:56 2011 +0200

    Merge branch 'f15' into f14

 .gitignore       |    1 +
 kdegraphics.spec |    8 ++++++--
 sources          |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---