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

[Than Ngo]

commit de5aa95dd1123c490d0f87584d0db9cccd287e6d
Merge: 41b439f b5b09b2
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:24:58 2011 +0200

    Merge branch 'f15' into f14

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