[kdeutils/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 5fe1d3c7a8db63a71449f7c85c92fecd48dbb855
Merge: 29cb737 c0d3ff6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 24 12:08:50 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	kdeutils.spec

 kdeutils-4.6.1-gpg2.patch |   24 ++++++++++++++++++++++++
 kdeutils.spec             |   23 ++++++++++++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)
---