[kdepim/f13/master: 6/6] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 0c00bb4e72f1663a0a97b0bf1307cf971257109d
Merge: 7aeef7e b7964cc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 28 08:48:36 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	kdepim.spec

 kdepim.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---