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

[Robert Scheck]

commit 195b8bd702a8fe3123cebce52e5d597b611076b4
Merge: 4cb0f67 2d71de1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Apr 22 05:50:19 2012 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore                  |    2 +-
 sources                     |    2 +-
 zarafa-7.0.3-boost149.patch |   28 ---------
 zarafa-7.0.4-php54.patch    |  130 -------------------------------------------
 zarafa.spec                 |   82 +++++++++++++++------------
 5 files changed, 47 insertions(+), 197 deletions(-)
---