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

[Robert Scheck]

commit 21938df2adddb72d1ba103345d84576aff387624
Merge: 400e3e4 6ee8c0a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 14:05:51 2011 +0200

    Merge remote branch 'origin/master' into el6

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