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

[Robert Scheck]

commit 0df02da54d6345b94bd3ba885c3a70f761b16b54
Merge: b1aaab6 fe126ce
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Oct 29 23:23:48 2010 +0200

    Merge remote branch 'origin/master' into f12

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