[kdetoys/f14: 3/3] Merge remote-tracking branch 'origin/f15' into f14

[Jaroslav Reznik]

commit d994bfb7659bbd61878adf73855d25b9e8916dc3
Merge: 697f64a f78bb30
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 18:45:29 2011 +0200

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

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