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

[Robert Scheck]

commit 885e85082d1e6615891e77358b192d47f513c12d
Merge: a3a7dba bd187d1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jun 27 15:08:54 2011 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore                 |    2 +-
 sources                    |    2 +-
 zarafa-7.0.0-cpp_std.patch |   14 ++++
 zarafa.spec                |  160 +++++++-------------------------------------
 4 files changed, 40 insertions(+), 138 deletions(-)
---