[zarafa/el5/master] (4 commits) ...Merge remote branch 'origin/master' into el5

[Robert Scheck]

Summary of changes:

  f22fb56... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  39fcbdb... Worked around the broken result of the mass rebuild script. (*)
  cc7b75a... Upgrade to 6.40.5 (*)
  1a23774... Merge remote branch 'origin/master' into el5

(*) This commit already existed in another branch; no separate mail sent