[glom/maemo5] (20 commits) ...Fixed merge.

[Murray Cumming <murrayc src gnome org>]

Summary of changes:

  b7c9606... Remove unwanted merge change. (*)
  bdb25e0... Add missing backslash in Makefile_libglom.am (*)
  bf60cdf... Fix python library lookup on Windows (*)
  a1ceaa3... Fixed the Windows build (*)
  95f5138... test_sqlite_music: Add singular titles for Maemo. (*)
  9dec38a... Ignore ~ backup files. (*)
  ccc0802... treeview_append_column(): (*)
  e554ce9... Update Czech translation. (*)
  05ff861... Do not mark an empty string for translation. (*)
  d6faabd... Fix some warnings. (*)
  91c5193... Avoid runtime warnings about 0 size TreeViewColumn. (*)
  ec10bf2... Trying to ignore unwanted column resize signals. (*)
  3ed10d1... Add .desktop and DBus .service files for Maemo 5 (*)
  060231f... Remove some unnecessary casts. (*)
  829cab4... Use libossomm on Maemo, to register a DBus service (*)
  7cf5ef3... List views and related records portals: Avoid zero-width co (*)
  fb690e8... List views and related records portals: Enough space for ti (*)
  1249f11... Fix merge (*)
  bad5007... Remove hard-coded column sizes. (*)
  4e8570c... Fixed merge.

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