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

[Rex Dieter]

commit 45a7d5bf34c0724f4582290ccb0e318a6d3eb225
Merge: dcb73e3 56b4238
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 12:38:28 2012 -0500

    Merge branch 'f17' into f16

 .gitignore          |    1 +
 kdepim-runtime.spec |    5 ++++-
 sources             |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---