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

[Rex Dieter]

commit b3096658e821e334d09d899094d393083d337e5a
Merge: ca11e26 1d8d1a8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 15:02:24 2010 -0500

    Merge branch 'master' into f14

 .gitignore    |    2 +-
 kdeutils.spec |   14 +++++++++++---
 sources       |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---