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

[Jaroslav Reznik]

commit 61170426a7f46adb32b00fa5d5b631ebf01dc492
Merge: 976a3d6 b281cc1
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 18:50:17 2011 +0200

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

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