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

[Robert Scheck]

Summary of changes:

  9373172... Use %filter_setup macro only in EPEL > 4 or at all Fedora r (*)
  4486627... Upgrade to 6.40.6 (*)
  1680036... Merge remote branch 'origin/master' into el5

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