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

[Robert Scheck]

commit ff0d5509b4bcd31d0eec5d6e7a04c8790a02baf9
Merge: 195b8bd 43789b1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed May 9 00:35:52 2012 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore                    |    2 +-
 sources                       |    2 +-
 zarafa-7.0.4-fd_setsize.patch |   36 ------------------------------------
 zarafa.spec                   |   14 ++++++++------
 4 files changed, 10 insertions(+), 44 deletions(-)
---