[kdepim/f13/master: 28/28] Merge branch 'f14' into f13

[Rex Dieter]

commit edf38f6e3a54651c247b221a6012b2d9b1b964f4
Merge: cca50e3 7fb8452
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 13:48:54 2010 -0500

    Merge branch 'f14' into f13
    
    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(-)
---