[kdeedu/f14/master: 5/6] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kdeedu into f14/master

[Kevin Kofler]

commit bcab1bde3e90b356d2950390bfaca101ba24cf0c
Merge: 9a67c07 aafde6b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Aug 23 00:16:31 2010 +0200

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/kdeedu into f14/master

---