[glib/wip/gsettings-list: 19/19] Merge branch 'master' into wip/gsettings-list

[Rodrigo Moya <rodrigo src gnome org>]

commit 65bd1f526d86ce08d6fa4d7d6fc1140198c9aef1
Merge: 3ed846e 6b631fa
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Tue Dec 7 10:15:00 2010 +0100

    Merge branch 'master' into wip/gsettings-list

 docs/reference/gio/overview.xml          |    2 +-
 gio/gsimpleasyncresult.c                 |    4 +-
 gio/tests/gapplication-example-actions.c |    3 -
 gio/tests/gdbus-peer.c                   |    7 +-
 gio/tests/socket-client.c                |    6 +-
 gio/tests/socket-server.c                |    6 +
 glib/giounix.c                           |   19 +-
 glib/gqueue.c                            |    2 +-
 glib/gslist.c                            |    6 +
 glib/gstring.c                           |    4 +-
 glib/libglib-gdb.py.in                   |    6 +-
 glib/tests/utils.c                       |    9 +-
 gobject/glib-genmarshal.c                |    2 +-
 gobject/libgobject-gdb.py.in             |    6 +-
 po/he.po                                 |  258 +++---
 po/zh_CN.po                              |  672 +++++++-------
 po/zh_HK.po                              | 1472 +++++++++++++++++------------
 po/zh_TW.po                              | 1491 +++++++++++++++++-------------
 18 files changed, 2261 insertions(+), 1714 deletions(-)
---