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

[Rex Dieter]

commit 26eee65e377f0eb7ed332e2fc5fd2b09fb5188e3
Merge: 8e49ed9 1d3ee53
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:00:09 2012 -0500

    Merge branch 'master' into f16

 .gitignore                             |    1 +
 kdepim-runtime-4.8.1-fix-version.patch |   12 ------------
 kdepim-runtime.spec                    |   11 ++++++-----
 sources                                |    2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)
---