[glom: 3/3] Merge branch 'maemo5'

[Murray Cumming <murrayc src gnome org>]

commit 2f91736ad72da54e5aa0e133a4153105722846a4
Merge: c8172c1... 83856b8...
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Sep 22 19:15:07 2009 +0200

    Merge branch 'maemo5'

 ChangeLog                                   |    8 +++
 configure.ac                                |    6 ++-
 glom/dialog_glom.cc                         |    2 +
 glom/dialog_glom.h                          |    4 ++
 glom/frame_glom.cc                          |    1 -
 glom/mode_data/notebook_data.cc             |   66 +++++++++++++++++++--------
 glom/mode_data/notebook_data.h              |   21 ++++++---
 glom/utility_widgets/db_adddel/db_adddel.cc |   13 +++++-
 8 files changed, 92 insertions(+), 29 deletions(-)
---