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

[Rex Dieter]

commit a0e9010c83f67a390557ab4fec3342d2cf132bfd
Merge: c76d67b 18d0a7b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:37:33 2011 -0600

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

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