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

[Robert Scheck]

commit 354e5d27e7ecbe164f8e5824ad7840c9791eef11
Merge: e7762f0 410170d
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jun 14 01:14:48 2011 +0200

    Merge remote branch 'origin/master' into f13

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