[zarafa/el4/master: 2/2] Merge remote branch 'origin/master' into el4

[Robert Scheck]

commit dccb67f8194b312f4a2478bbe8b82535aed4020d
Merge: 5e11b60 64f29bf
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Aug 31 21:27:23 2010 +0200

    Merge remote branch 'origin/master' into el4
    
    Conflicts:
    	.gitignore
    	zarafa.spec

 .gitignore                           |    2 +-
 sources                              |    2 +-
 zarafa-6.40.0-undefined-symbol.patch |   42 --------------------------------
 zarafa.spec                          |   44 ++++++++++++++++++---------------
 4 files changed, 26 insertions(+), 64 deletions(-)
---