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

[Rex Dieter]

commit b5baca503ee8d87c768f8a59e9390269db1804f9
Merge: 43a13e2 6bc2494
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 22:51:51 2012 -0500

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

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