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

[Jaroslav Reznik]

commit 810cf2260658569652e5160e3072f8d3ef089081
Merge: 269be09 1d54965
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 16:38:28 2011 +0200

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

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