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

[Rex Dieter]

commit 5d9812ba5cc7507b659d0e9e19dbf455e629da17
Merge: 0515551 e22eb67
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 6 07:28:23 2012 -0500

    Merge branch 'f17' into f16

 kdepim-4.8.4-filtering.patch |   36 ++++++++++++++++++++++++++++++++++++
 kdepim.spec                  |   10 ++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
---