[glib/wip/gapplication: 11/11] Merge branch 'master' into wip/gapplication

[Colin Walters <walters src gnome org>]

commit b74688ea041d9b9127deb03f0bfa8f6a5c35f037
Merge: 0fa3929 c874a76
Author: Colin Walters <walters verbum org>
Date:   Fri May 28 09:17:56 2010 -0400

    Merge branch 'master' into wip/gapplication

 configure.in                           |   54 +++
 docs/reference/gio/migrating-gconf.xml |   10 +
 docs/reference/gio/migrating-posix.xml |  554 --------------------------------
 docs/reference/glib/building.sgml      |   42 +++
 docs/reference/glib/running.sgml       |   13 +
 gio/fen/fen-kernel.c                   |    8 +
 gio/fen/fen-node.c                     |   13 -
 glib/Makefile.am                       |   23 ++
 glib/gdataset.c                        |    6 +-
 glib/glib.stp.in                       |   84 +++++
 glib/glib_probes.d                     |    8 +
 glib/glib_trace.h                      |   43 +++
 glib/gmem.c                            |   52 +++-
 glib/gslice.c                          |    5 +
 glib/gutf8.c                           |   26 +-
 glib/gvariant-serialiser.c             |   12 +-
 glib/tests/gvariant.c                  |    6 +-
 gobject/Makefile.am                    |   22 ++
 gobject/gobject.c                      |   28 ++-
 gobject/gobject.stp.in                 |  199 ++++++++++++
 gobject/gobject_probes.d               |   13 +
 gobject/gobject_trace.h                |   43 +++
 gobject/gsignal.c                      |   11 +-
 gobject/gtype.c                        |    9 +-
 m4macros/gsettings.m4                  |    2 +-
 25 files changed, 683 insertions(+), 603 deletions(-)
---