[kdeedu/f12/master: 46/46] Merge remote branch 'origin/f13/master' into f12/master

[Rex Dieter]

commit 2ce1bf755f7e160f31d70b537814a898e8bae38b
Merge: 01a8ccf 35f817b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 11 09:26:40 2010 -0500

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

 kdeedu.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---