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

[Rex Dieter]

commit 22e0b0424f26efb99ecebdfadcb87c4fe0a94fd3
Merge: ddf9b6e 1230899
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 09:53:51 2012 -0500

    Merge branch 'f17' into f16

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