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

[Robert Scheck]

commit b1aaab61af269937b7e67ff053b29c4385799ed8
Merge: ce03481 64f29bf
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Aug 31 21:22:48 2010 +0200

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

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