[glom/feature_choices_related_layout: 4/4] Merge branch 'master' into feature_choices_related_layout

[Murray Cumming <murrayc src gnome org>]

commit cb0576e125acec425d67b387fd33720687e46aef
Merge: d6dc64d 3cc0d5f
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 6 13:25:33 2010 +0200

    Merge branch 'master' into feature_choices_related_layout

 ChangeLog                                          |   25 +++++++++++++++
 configure.ac                                       |    2 +-
 glom/import_csv/dialog_import_csv.cc               |   14 ++------
 .../relationships_overview/canvas_group_dbtable.cc |    4 +-
 .../dialog_relationships_overview.cc               |    2 +-
 glom/print_layout/canvas_print_layout.cc           |    4 +-
 glom/print_layout/canvas_print_layout.h            |    2 +-
 glom/utility_widgets/canvas/canvas_text_movable.cc |    4 +-
 glom/utility_widgets/canvas/canvas_text_movable.h  |    4 +-
 glom/utility_widgets/flowtable.cc                  |   21 ++++++++----
 glom/utility_widgets/flowtable.h                   |   33 +++++++++----------
 11 files changed, 69 insertions(+), 46 deletions(-)
---