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

[Rex Dieter]

commit e3dc813d8758c18ae0a5fa2e209491d794b8eecb
Merge: ff5a052 edab017
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:59:54 2012 -0500

    Merge branch 'master' into f16

 .gitignore                            |    1 +
 kdepim-4.8.1-fix-version.patch        |   12 ------------
 kdepim-4.8.1-kalarm_cannot_save.patch |   19 -------------------
 kdepim.spec                           |   14 +++++---------
 sources                               |    2 +-
 5 files changed, 7 insertions(+), 41 deletions(-)
---