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

[Rex Dieter]

commit 7d0d7733620cbaf5f830ac503d37593a806de8de
Merge: 3892c93 427196f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:24:12 2012 -0500

    Merge branch 'f17' into f16

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