[kdepimlibs/f16: 2/3] Merge branch 'master' into f16

[Rex Dieter]

commit 0feb00846da482b7278669dacf2beff47e379aee
Merge: 7f431cc 504563d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 09:56:54 2012 -0500

    Merge branch 'master' into f16

 .gitignore      |    3 +--
 kdepimlibs.spec |   11 ++++++++---
 sources         |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---