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

[Rex Dieter]

commit dcb73e378ad714fb3a8bccdeabedd9950d940495
Merge: 095a61d 1a175e6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:18:49 2012 -0500

    Merge branch 'f17' into f16

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