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

[Robert Scheck]

commit 18041a9f2afe9ef318befb4c8e7ab681a9d62597
Merge: 336b71a 04b111c
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Jan 13 01:33:35 2012 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore                    |    2 +-
 sources                       |    2 +-
 zarafa-7.0.3-boost149.patch   |   28 +++++++++
 zarafa-7.0.4-fd_setsize.patch |   36 +++++++++++
 zarafa-7.0.4-php54.patch      |  130 +++++++++++++++++++++++++++++++++++++++++
 zarafa.spec                   |   30 ++++++++--
 6 files changed, 220 insertions(+), 8 deletions(-)
---