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

[Robert Scheck]

commit 14a6926cfc8a02b5039a578b70ab413f2f61b109
Merge: 397012a bd187d1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jun 27 15:07:04 2011 +0200

    Merge remote branch 'origin/master' into f15

 .gitignore                 |    2 +-
 sources                    |    2 +-
 zarafa-7.0.0-cpp_std.patch |   14 ++++
 zarafa.spec                |  160 +++++++-------------------------------------
 4 files changed, 40 insertions(+), 138 deletions(-)
---
diff --cc zarafa.spec
index f6e0945,03a6303..4e6c446
--- a/zarafa.spec
+++ b/zarafa.spec
@@@ -137,9 -18,9 +18,9 @@@
  
  Summary:            Open Source Edition of the Zarafa Collaboration Platform
  Name:               zarafa
- Version:            6.40.9
+ Version:            7.0.0
  %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