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

[Robert Scheck]

commit fbab1b938aa967e3b97d4cbb68e46ea58db2798d
Merge: efd4a03 295fbd2
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 9 22:47:54 2010 +0200

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

 .gitignore                           |    2 +-
 sources                              |    1 +
 zarafa-6.40.0-package.patch          |   61 ++
 zarafa-6.40.0-undefined-symbol.patch |   42 ++
 zarafa-webaccess.conf                |   32 +
 zarafa.ini                           |    2 +
 zarafa.logrotate                     |   13 +
 zarafa.spec                          | 1025 ++++++++++++++++++++++++++++++++++
 8 files changed, 1177 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 0e7e07b,7551c2f..19416c0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- zarafa-6.30.10.tar.gz
 -zarafa-6.40.0.tar.gz
+ zarafa-6.40.1.tar.gz