[glom/feature_choices_related_layout: 2/2] Merged from master.

[Murray Cumming <murrayc src gnome org>]

commit 4c7846e2872ccb3b07a0ce7d1313abf7a183271b
Merge: 62b2ea8 39bd6c8
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Aug 9 02:24:26 2010 +0200

    Merged from master.

 ChangeLog                                  |    7 +++++
 tests/test_document_autosave.cc            |   18 +++++++-------
 tests/test_selfhosting_new_empty.cc        |    8 ++++-
 tests/test_selfhosting_new_from_example.cc |   37 +++++++++++++++-------------
 4 files changed, 42 insertions(+), 28 deletions(-)
---