[kdepim/f16: 18/18] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 4966e281d356769a1425eeee378d684064d5cb1c
Merge: e13141d 55feaa1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:28:10 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdepim.spec
    	sources

 .gitignore                              |    4 +--
 kdepim-4.7.2-nepomuk_notification.patch |   12 -------
 kdepim-4.7.97-fix-for-g++47.patch       |   13 +++++++
 kdepim.spec                             |   54 +++++++++++++++++++++++++-----
 sources                                 |    2 +-
 5 files changed, 60 insertions(+), 25 deletions(-)
---