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

[Rex Dieter]

commit 0614d3dfdd8492ff042941ede45586b1aabe9412
Merge: 7f431cc f95031d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 21 13:16:14 2012 -0500

    Merge branch 'master' into f16

 kdepimlibs.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---