[libkdeedu/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 7121e0ac2ed154dcfe511aaefd3eee8706afe087
Merge: 2a202bb bd33d4d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:53:47 2012 -0500

    Merge branch 'master' into f16

 .gitignore     |    3 +--
 libkdeedu.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---