[kde-runtime/f17: 22/22] Merge branch 'f18' into f17

[Rex Dieter]

commit 0379851fb4848dbd7098cac2fe116e5e21586f63
Merge: fb8db37 a24044a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 6 19:12:37 2013 -0600

    Merge branch 'f18' into f17

 .gitignore                          |    5 +--
 kde-runtime-4.9.98-kde#310486.patch |   75 +++++++++++++++++++++++++++++++++++
 kde-runtime.spec                    |   56 ++++++++++++++++++++++----
 sources                             |    2 +-
 4 files changed, 125 insertions(+), 13 deletions(-)
---