[kdepim-runtime/f15/master: 12/13] Merge remote-tracking branch 'origin/f14/master' into f15/master

[Rex Dieter]

commit 868be6e04eb6012c17375e55c471b5469b48fcfd
Merge: afd2c9e 4de7dd5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Feb 10 15:49:05 2011 -0600

    Merge remote-tracking branch 'origin/f14/master' into f15/master
    
    reverting to kdepim-4.4.x is so fun fun fun
    
    Conflicts:
    	.gitignore
    	kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch
    	kdepim-runtime.spec
    	sources

 .gitignore                                        |    4 +-
 kdepim-runtime-4.4.0-show-akonadi-kcm-kde45.patch |   15 ++++
 kdepim-runtime-4.4.93-show_akonadi_kcm.patch      |   15 ----
 kdepim-runtime-4.5.94.1-no_translations.patch     |    9 --
 kdepim-runtime.spec                               |   92 +++++++++------------
 sources                                           |    2 +-
 6 files changed, 58 insertions(+), 79 deletions(-)
---