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

[Rex Dieter]

commit 981ea86e487d007d3b52bbe2824c42890551b975
Merge: 9722aa9 269db69
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:25:45 2013 -0600

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

 kdeutils.spec |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---