[calligra] (7 commits) ...Merge branch 'master' into f18

[Rex Dieter]

Summary of changes:

  87a48bf... fix FTBFS on arm (*)
  534f87d... 2.5.4 (*)
  42fc063... drop upstreamed patch (*)
  6a07235... update %%files (*)
  bcb411b... bring back piece of tables_to_sheets.patch (*)
  2738312... 2.5.5 (*)
  cff9703... Merge branch 'master' into f18 (*)

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