[glom/boostpythonretry: 12/12] Merge branch 'master' into boostpythonretry

[Murray Cumming <murrayc src gnome org>]

commit eaec43607b9ff5a1f8664c0c6ae3986630ffdd49
Merge: 3d85e08 55ffba3
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 9 09:54:05 2010 +0100

    Merge branch 'master' into boostpythonretry
    
    Conflicts:
    	ChangeLog
    	glom/libglom/python_embed/py_glom_record.h
    	glom/libglom/python_embed/py_glom_relatedrecord.h
    	glom/python_embed/glom_python.cc

 ChangeLog                                      |   51 ++-
 NEWS                                           |   19 +
 configure.ac                                   |    4 +-
 glom/libglom/data_structure/glomconversions.cc |    5 +
 glom/libglom/utils.cc                          |    7 +
 po/cs.po                                       |  213 +++----
 po/de.po                                       |  804 ++++++++++++------------
 po/es.po                                       |  255 ++++----
 po/sl.po                                       |  311 ++++-----
 9 files changed, 811 insertions(+), 858 deletions(-)
---