[kdeedu/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 613455acbce473fc85edd51920dcd091ac544c05
Merge: 8f66325 21c75f8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 21:45:05 2010 -0500

    Merge remote branch 'origin/master' into f14/master

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