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

[Robert Scheck]

commit 51c92efecb9c003e82218ee245bdaa33ee325555
Merge: 0e3d0ba 4486627
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Mar 21 16:38:55 2011 +0100

    Merge remote branch 'origin/master' into el4

 .gitignore                   |    2 +-
 sources                      |    2 +-
 zarafa-6.40.5-svn25200.patch |   38 -------------------------------
 zarafa.spec                  |   51 +++++++++++++++++++++++++++++++----------
 4 files changed, 40 insertions(+), 53 deletions(-)
---