[kdepim/f15/master: 15/16] Merge remote-tracking branch 'origin/f14/master' into f15/master

[Rex Dieter]

commit 5243d9a45d787c7ee3cf78668c250be0f0e78276
Merge: 3e8e688 0bcc778
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Feb 10 15:45:31 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.spec
    	sources

 .gitignore                                         |    2 +-
 kdepim-4.3.1-kmail-saveAttachments.patch           |   37 ++++
 ...ers.patch => kdepim-4.4.0-install-headers.patch |  120 +++++++------
 kdepim-4.4.5-libassuan1.patch                      |   37 ++++
 kdepim.spec                                        |  188 +++++++++++---------
 kdepim_4.4.93_newresultpage_mem_fn-fixbuild.patch  |   11 --
 sources                                            |    2 +-
 7 files changed, 243 insertions(+), 154 deletions(-)
---