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

[Rex Dieter]

commit 8450bc1c7c7ec26a8173af3b9e65559abb418b85
Merge: 7121e0a ebf8dd8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 16:44:31 2012 -0500

    Merge branch 'master' into f16

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