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

[Robert Scheck]

commit e3e84939974918db6e9944f21f1bfd11c2270f0e
Merge: 45fd046 6ee8c0a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 14:06:31 2011 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   15 +++++----------
 3 files changed, 7 insertions(+), 12 deletions(-)
---