[kdepim-runtime/f13/master: 20/20] Merge remote-tracking branch 'origin/f15/master' into f13

[Rex Dieter]

commit c321556a8e1e6f04c060f0f79cebbac0cf7c4405
Merge: 285d511 e096280
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 22 07:30:34 2011 -0500

    Merge remote-tracking branch 'origin/f15/master' into f13

 .gitignore          |    4 +---
 kdepim-runtime.spec |   26 ++++++++++++++++++++++----
 sources             |    2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)
---