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

[Rex Dieter]

commit c76d67b9a8a779843496596a73623dcc1af0e238
Merge: 5f8ce57 f9787e8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Dec 4 13:45:48 2010 -0600

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	kdeedu.spec

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