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

[Robert Scheck]

commit ede8ab090d2cba272bbbc9e25012d673a3a62892
Merge: 97566cb b4fce50
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Apr 6 01:02:14 2011 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore       |    2 +-
 sources          |    2 +-
 zarafa.logrotate |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 zarafa.spec      |   23 ++++++++++----
 4 files changed, 97 insertions(+), 11 deletions(-)
---
diff --cc zarafa.spec
index acd4952,442dc0e..2d85a89
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -137,9 -137,9 +137,9 @@@
  
  Summary:            Open Source Edition of the Zarafa Collaboration Platform
  Name:               zarafa
- Version:            6.40.6
+ Version:            6.40.7
  %if %{beta_or_rc}
 -Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 +Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}.1
  %else
  Release:            %{actual_release}%{?dist}
  %endif