[kdepim/f12/master: 65/65] Merge branch 'f14' into f12

[Rex Dieter]

commit 1772eac29e4e19ecc14322598e24013abb6e5ca9
Merge: 5035642 7fb8452
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 13:49:32 2010 -0500

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

 .gitignore                    |    1 +
 kdepim-4.4.5-libassuan1.patch |   37 +++++++++++++++++++++++++++++++++++++
 kdepim.spec                   |   34 ++++++++++++++++++++++++++++------
 sources                       |    2 +-
 4 files changed, 67 insertions(+), 7 deletions(-)
---