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

[Rex Dieter]

commit fb8db374fd33a5a99994c816d00da5f18eb056bf
Merge: eede33a fa7a7f0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 19:25:43 2012 -0600

    Merge branch 'f18' into f17

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