[kdepim-runtime/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit c8b90fdd6600d912b1792f4caa53e36a34ae29d6
Merge: 667fd19 57c489c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 13 08:50:04 2011 -0500

    Merge branch 'master' into f16

 kdepim-runtime-4.7.2-nepomuk_notification.patch |   14 ++++++++++++++
 kdepim-runtime.spec                             |   13 ++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
---