[libkdeedu/f16: 7/7] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 2a202bb2525a411dc078e53a70041211e80dccb5
Merge: 41b276c c197281
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:12:51 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	libkdeedu.spec
    	sources

 .gitignore     |    4 ++--
 libkdeedu.spec |   29 +++++++++++++++++++++++++----
 sources        |    2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)
---