[kdegraphics/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 7b5e801bbc4f844843c58e9a1c4ef7a2d0d57203
Merge: 115567d ccbfd0c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 13:14:28 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	kdegraphics.spec

 kdegraphics.spec |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)
---