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

[Robert Scheck]

commit a3a7dbab8469926aebc0491e1194f6bd3748fbaf
Merge: 22282f1 410170d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 14 01:16:12 2011 +0200

    Merge remote branch 'origin/master' into el5

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