[kdepimlibs/f13/master: 25/25] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 1132f8e4cb5bdaaf9b51736543899c893ddb7482
Merge: 49fd6b5 f54ee48
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 14:39:39 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdepimlibs.spec
    	sources

 .gitignore      |    2 +-
 kdepimlibs.spec |   51 +++++++++++++++++++++++++++++++++++----------------
 sources         |    2 +-
 3 files changed, 37 insertions(+), 18 deletions(-)
---