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

[Robert Scheck]

commit b1e38fa3f8ebf6efedcb003d68593e2171249e06
Merge: 8e68e8f d794719
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat May 28 15:10:50 2011 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc zarafa.spec
index f101c2d,e0f4612..32b8973
--- 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.7
+ Version:            6.40.8
  %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