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

[Robert Scheck]

commit 34137dd66c3c1c022d94fffd6731a570d50aef6a
Merge: 76f81eb 810c7ce
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed Apr 6 01:18:00 2011 +0200

    Merge remote branch 'origin/master' into el5

 zarafa.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---