[kdesdk/f18: 10/10] Merge branch 'master' into f18

[Rex Dieter]

commit ac633affb5324ef367680f5b7ed0501060b68886
Merge: 7a202a7 cd56f43
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:27:51 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdesdk.spec
    	sources

 .gitignore  |    3 +--
 kdesdk.spec |   40 +++++++++++++++++++++++-----------------
 sources     |    2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)
---