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

[Rex Dieter]

commit 4093c0b6e4b07cedd8d2183c792a295e56cf9946
Merge: 3e60f31 0bc6ab0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:26:47 2012 -0600

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

 .gitignore                                         |    3 +-
 ...=> 0001-add-sqlite-support-to-akonadi-kcm.patch |   39 +++++--
 kdepim-runtime-4.7.2-nepomuk_notification.patch    |   14 ---
 kdepim-runtime.spec                                |  104 ++++++++++++-------
 sources                                            |    2 +-
 5 files changed, 96 insertions(+), 66 deletions(-)
---