[kdeedu/f14: 4/4] Merge branch 'f15' into f14

[Than Ngo]

commit 269be09de8f7256bb9c6f9735dcd1e9dd51e565a
Merge: bbecd52 0f00c0f
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 15:53:18 2011 +0200

    Merge branch 'f15' into f14

 .gitignore                    |    1 +
 kdeedu-4.6.4-marble-doc.patch |   20 ++++++++++++++++++++
 kdeedu.spec                   |   18 ++++++++++--------
 sources                       |    2 +-
 4 files changed, 32 insertions(+), 9 deletions(-)
---