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

[Rex Dieter]

commit ff5a052abf6860d88f9b0a482131366cf8c5016e
Merge: 6380107 7103d2a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 29 09:21:28 2012 -0500

    Merge branch 'master' into f16

 kdepim-4.8.1-kalarm_cannot_save.patch |   19 +++++++++++++++++++
 kdepim.spec                           |    9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---