[zarafa/el6/master: 3/3] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit a8555d26356ec977ee7c15a3fadc29c261d17ea7
Merge: 3943a3b 4486627
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Mar 21 16:37:43 2011 +0100

    Merge remote branch 'origin/master' into el6

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