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

[Rex Dieter]

commit 6ec8d198998ffc16f4653b47a5252ed39a2b2008
Merge: e24b7fb 1e64511
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 25 16:54:46 2012 -0500

    Merge branch 'f17' into f16

 kdepim.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---