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

[Robert Scheck]

commit c3c27ec5a4c62113280cf382e26a33cf38571d95
Merge: 194a11f fe126ce
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:23:09 2010 +0200

    Merge remote branch 'origin/master' into f13

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