[glom/maemo5: 7/8] Merge branch 'master' into maemo5

[Murray Cumming <murrayc src gnome org>]

commit 5650a045a5d9142bfdb233ddf19cdf444a040bad
Merge: d6dd868... 59a49a9...
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 12 14:21:06 2009 +0200

    Merge branch 'master' into maemo5

 ChangeLog                                          |   33 ++++-
 Makefile.am                                        |    2 +-
 Makefile_libegg.am                                 |    4 +-
 NEWS                                               |   11 ++-
 configure.ac                                       |    3 +-
 glom/frame_glom.cc                                 |    4 +-
 glom/glom.glade                                    |  160 ++++++++++++++------
 glom/import_csv/csv_parser.cc                      |   39 ++++-
 glom/import_csv/dialog_import_csv.cc               |    1 +
 glom/libglom/.gitignore                            |   12 +-
 glom/libglom/data_structure/field.cc               |    4 +
 .../db_adddel/db_adddel_withbuttons.cc             |    4 +-
 .../db_adddel/db_adddel_withbuttons.h              |    6 +-
 tests/.gitignore                                   |    8 +-
 tests/import/test_parsing.cc                       |   18 ++-
 15 files changed, 231 insertions(+), 78 deletions(-)
---