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

[Robert Scheck]

commit 3bd957acf444794ef5e5e02821ba91ff60ecfc12
Merge: 30174be 410170d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 14 01:15:27 2011 +0200

    Merge remote branch 'origin/master' into el6

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