[kdepim-runtime/f12/master: 40/40] Merge branch 'f14' into f12

[Rex Dieter]

commit c2134a1eb8b3b2d4333225196f78c6527c0a5100
Merge: 6b23c5b 9a2ed1b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 13:47:30 2010 -0500

    Merge branch 'f14' into f12
    
    Conflicts:
    	.gitignore
    	kdepim-runtime.spec
    	sources

 .gitignore                                        |    1 +
 kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch |   15 ++++++++++
 kdepim-runtime.spec                               |   30 ++++++++++++++++----
 sources                                           |    2 +-
 4 files changed, 41 insertions(+), 7 deletions(-)
---