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

[Than Ngo]

commit 9859907ecf1482f873d571654c7b611dd0bf175a
Merge: 8342d56 5892c6f
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:42:29 2013 +0100

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

 .gitignore     |    1 +
 libkdeedu.spec |   21 ++++++++++++++++++---
 sources        |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 421b592,cb23a6a..c355f7a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/libkdeedu-4.8.5.tar.xz
 +/libkdeedu-4.9.1.tar.xz
 +/libkdeedu-4.9.2.tar.xz
 +/libkdeedu-4.9.3.tar.xz
 +/libkdeedu-4.9.4.tar.xz
 +/libkdeedu-4.9.5.tar.xz
+ /libkdeedu-4.10.1.tar.xz