[kdesdk/f17: 13/13] Merge branch 'f18' into f17

[Rex Dieter]

commit 639751cffda68ec71e13fdd89018c57caa2724b4
Merge: 617093f 85c4ea6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:17:26 2013 -0600

    Merge branch 'f18' into f17

 .gitignore  |    3 +--
 kdesdk.spec |   46 ++++++++++++++++++++++++++--------------------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)
---