[kdesdk/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Jaroslav Reznik]

commit 5d85be8524451f9e5e8b8497852a2e090c4188ab
Merge: de5aa95 6034ecf
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 18:29:36 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore  |    4 +---
 kdesdk.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---