[kdeedu/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 8f663259b00086b533571b4c0b46c1e6eee2abfd
Merge: 37b5da7 7d2acae
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 12:34:38 2010 -0500

    Merge branch 'master' into f14

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