[kdepim-runtime/f13/master: 21/21] Merge branch 'f14' into f13

[Rex Dieter]

commit 4e3cc95ebd44e61d502479d42e8d84fea2f370ff
Merge: bc2eb4b 9a2ed1b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 13:46:32 2010 -0500

    Merge branch 'f14' into f13
    
    Conflicts:
    	kdepim-runtime.spec

 kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch |   15 ++++++++++++
 kdepim-runtime.spec                               |   25 ++++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)
---