[glibmm/vector: 14/14] Merge branch 'master' into vector

[Krzesimir Nowak <krnowak src gnome org>]

commit 3463ed2e0889b805b70183a8cbed4cd0a428c8a0
Merge: 9937847 d1467d7
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Jan 17 23:09:10 2011 +0100

    Merge branch 'master' into vector

 ChangeLog                  |  130 ++++++++++++++++++++++++----
 NEWS                       |   28 ++++++
 configure.ac               |    2 +-
 examples/Makefile.am       |    3 +
 examples/dbus/busserver.cc |  202 ++++++++++++++++++++++++++++++++++++++++++++
 examples/dbus/peer.cc      |   82 ++++++++++++++++--
 gio/src/dbusconnection.ccg |   48 ++++++-----
 gio/src/dbusconnection.hg  |   18 +++--
 gio/src/dbusownname.ccg    |   10 ++-
 gio/src/dbusownname.hg     |   16 ++--
 gio/src/dbusserver.ccg     |    7 ++
 gio/src/dbusserver.hg      |    3 +
 gio/src/dbuswatchname.ccg  |   21 +++--
 gio/src/dbuswatchname.hg   |   29 ++++---
 gio/src/inetaddress.hg     |   13 +++
 gio/src/unixfdlist.hg      |    2 +
 glib/src/variant.ccg       |   12 +--
 glib/src/variant.hg        |   25 +++---
 tools/m4/class_gobject.m4  |   12 ++-
 tools/m4/class_shared.m4   |    6 +-
 tools/m4/convert_glib.m4   |    5 +-
 21 files changed, 563 insertions(+), 111 deletions(-)
---