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

[Rex Dieter]

commit 2423b23136d30fae0c0b08c59f87377c893b594c
Merge: af642aa 43bb7e3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:00:15 2012 -0500

    Merge branch 'f18' into f17

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