[kdepim/f13/master: 2/2] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 07a240799228021114ab26a8aca53fdc412172c2
Merge: 86b160d 23353f8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 13 08:13:35 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 kdepim-4.4.9-kde248256.patch |   10 ++++++++++
 kdepim.spec                  |   11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---