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

[Robert Scheck]

commit 57a2484789660e7e9f59ef402f0775f2b818d115
Merge: a8555d2 b4fce50
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Apr 6 01:04:22 2011 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore       |    2 +-
 sources          |    2 +-
 zarafa.logrotate |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 zarafa.spec      |   24 ++++++++++++----
 4 files changed, 99 insertions(+), 10 deletions(-)
---