[glom/maemo5: 20/20] Fixed merge.

[Murray Cumming <murrayc src gnome org>]

commit 4e8570c01d85aa8274b736f04df81f5b6cdc982c
Merge: 217a3cd... bad5007...
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Nov 2 10:24:17 2009 +0100

    Fixed merge.

 .gitignore                                         |    1 +
 ChangeLog                                          |  113 +
 Makefile.am                                        |   19 +-
 Makefile_libglom.am                                |    3 +
 configure.ac                                       |    4 +-
 .../test_sqlite_music/test_sqlite_music.glom       |   34 +-
 glom.desktop.in.in                                 |    1 +
 glom.service.in                                    |    3 +
 glom/application.cc                                |    2 +
 glom/dialog_connection.cc                          |    2 +-
 glom/dialog_existing_or_new.cc                     |    4 +-
 glom/libglom/connectionpool.cc                     |  109 -
 glom/libglom/connectionpool.h                      |    4 +-
 glom/libglom/data_structure/has_title_singular.cc  |    2 +-
 glom/libglom/spawn_with_feedback.cc                |    1 +
 glom/main.cc                                       |  115 +
 glom/mode_data/box_data_portal.cc                  |    2 +-
 .../print_layouts/print_layout_toolbar_button.cc   |    4 +-
 glom/utility_widgets/db_adddel/db_adddel.cc        |   50 +-
 glom/utility_widgets/db_adddel/db_adddel.h         |    3 -
 glom/utility_widgets/layouttoolbar.cc              |    4 +-
 glom/utility_widgets/layouttoolbarbutton.cc        |    4 +-
 glom/utils_ui.cc                                   |   34 +-
 glom/utils_ui.h                                    |   10 +-
 glom/xsl_utils.cc                                  |    4 +-
 macros/mm-python.m4                                |    7 +-
 po/cs.po                                           | 2392 +++++++++++---------
 win32/build-installer                              |   62 +-
 win32/glom.iss.in                                  |   34 +-
 29 files changed, 1726 insertions(+), 1301 deletions(-)
---