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

[Rex Dieter]

commit 733ec38f0152c1a698da4a126680d5620109b327
Merge: ced80d9 c3f7bb7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:00:29 2012 -0500

    Merge branch 'f18' into f17

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