[kdepimlibs/f14/master: 15/15] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Rex Dieter]

commit 3a063056b13335ff3768e9eb77ac0eeb399d27ca
Merge: 7d0fdcf 1ca9c3b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 14 09:55:01 2011 -0500

    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	.gitignore
    	kdepimlibs.spec
    	sources

 .gitignore                                   |    2 +-
 kdepimlibs-4.5.5-no_overlapping_memcpy.patch |   29 --------------
 kdepimlibs.spec                              |   54 ++++++++++++++++---------
 sources                                      |    2 +-
 4 files changed, 36 insertions(+), 51 deletions(-)
---