[kdeedu/f17: 8/8] Merge branch 'master' into f17

[Rex Dieter]

commit 094fae00cb93aa990bc725cac0d9847de7270b90
Merge: dca9025 26e070a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 11:58:46 2012 -0500

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

 kdeedu.spec |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
---