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

[Robert Scheck]

commit fe71bb127acafa4018ba0eef0703dacf4dd2e4c3
Merge: 1d8c1cd 64f29bf
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Aug 31 21:25:31 2010 +0200

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore

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