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

[Robert Scheck]

Summary of changes:

  810c7ce... Add a forgotten backslash (*)
  34137dd... Merge remote branch 'origin/master' into el5

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