[kdeutils/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit ca11e262ec9b26c6013bd8f308cc3240c48ad22f
Merge: cfee91c 6109850
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 17 07:14:24 2010 -0500

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

 kdeutils.spec |  199 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 160 insertions(+), 39 deletions(-)
---