[kdepimlibs/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Rex Dieter]

commit ab3a2d9516bfee8b4071443f6189e138dec6497f
Merge: 60003a7 7cc0916
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:10:14 2011 -0500

    Merge remote-tracking branch 'origin/f15' into f14

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