[glom] (13 commits) ...Fixed merge.

[Murray Cumming <murrayc src gnome org>]

Summary of changes:

  34252a4... Maemo: Really fall back to the standard layout if there is  (*)
  9f3c28c... Removed debug output. (*)
  7125381... Merge branch 'master' into maemo5 (*)
  682d75f... Revert unwanted merge change. (*)
  6b7aa06... Maemo: Hide group titles by default. (*)
  eb085d9... Maemo: Related Records / AddDel: Use icon-only Hildon butto (*)
  aeefe30... Maemo: List: Use only 2 columns by default, so some have en (*)
  05ea22e... Maemo: Allow editing of hidden tables (only) via its detail (*)
  d7ef137... DbAddDel: Expand an appropriate column. (*)
  37d637c... Maemo: List: Click to view details. (*)
  8cb4058... Added a sqlite example just for testing. (*)
  8c090f6... Tests: Import: Fixed the no-exceptions build. (*)
  2d466df... Fixed merge.

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