[kdeedu/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 42a769e5f2009858c0fed992ae90bac460534f52
Merge: 5b45f22 dc2a19a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 13:13:41 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	kdeedu.spec

 kdeedu.spec |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)
---