[libkdeedu/f17: 10/10] Merge branch 'master' into f17

[Rex Dieter]

commit 41435c83f98d1368d95b2de793bf4ddd38e5703d
Merge: 1230899 1c3a3e0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:25:55 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	libkdeedu.spec
    	sources

 .gitignore     |    3 +--
 libkdeedu.spec |   28 +++++++++++++++++++++++-----
 sources        |    2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)
---