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

[Robert Scheck]

commit 50f1ab92b00dac6ed8311b382b2fc831d8a50990
Merge: fe71bb1 fe126ce
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:25:11 2010 +0200

    Merge remote branch 'origin/master' into el5

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