[glib/tls-database: 47/47] Merge branch 'master' into tls-database

[Stefan Walter <stefw src gnome org>]

commit 1b2b8ba5219901ab436b2aa2759119165a41fb6c
Merge: 1e8bd63 2a6fec6
Author: Stef Walter <stefw collabora co uk>
Date:   Sun Dec 26 10:26:56 2010 -0600

    Merge branch 'master' into tls-database

 NEWS                                  |   45 +
 configure.ac                          |   10 +-
 docs/reference/gio/gio-docs.xml       |    4 -
 docs/reference/gio/gio-sections.txt   |   28 +-
 docs/reference/gio/gio.types          |    1 -
 docs/reference/glib/building.sgml     |   25 +-
 docs/reference/glib/glib-sections.txt |    2 +
 gio/Makefile.am                       |    2 -
 gio/gappinfo.c                        |   27 +
 gio/gappinfo.h                        |    7 +
 gio/gapplication.c                    |    8 +-
 gio/gapplicationcommandline.c         |    8 +-
 gio/gapplicationimpl-dbus.c           |    2 +
 gio/gasyncresult.h                    |    4 +-
 gio/gbufferedinputstream.c            |   15 +-
 gio/gdatainputstream.c                |   96 +-
 gio/gdataoutputstream.c               |   16 +-
 gio/gdesktopappinfo.c                 |  330 +++-
 gio/gemblemedicon.c                   |  133 ++-
 gio/gemblemedicon.h                   |   15 +
 gio/gfile.c                           |  183 ++--
 gio/gfileinputstream.c                |    8 +-
 gio/gfileinputstream.h                |    2 +-
 gio/gfileiostream.c                   |    8 +-
 gio/gfileiostream.h                   |    2 +-
 gio/gfileoutputstream.h               |    2 +-
 gio/ginputstream.c                    |   28 +-
 gio/gio.h                             |    1 -
 gio/gio.symbols                       |   20 +-
 gio/gioenums.h                        |    2 +-
 gio/giostream.c                       |   14 +-
 gio/goutputstream.c                   |   36 +-
 gio/goutputstream.h                   |    2 +-
 gio/gperiodic.c                       |  765 ---------
 gio/gperiodic.h                       |   88 -
 gio/gsettings.c                       |   27 +-
 gio/gsimpleactiongroup.c              |    4 +-
 gio/gsimpleasyncresult.c              |   59 +-
 gio/gsocks5proxy.c                    |    2 +-
 gio/gtlsclientconnection.c            |   16 +-
 gio/gtlsclientconnection.h            |    2 +-
 gio/gtlsconnection.c                  |    6 +-
 gio/tests/.gitignore                  |    1 +
 gio/tests/desktop-app-info.c          |   54 +-
 gio/tests/socket-client.c             |   35 +-
 glib/gfileutils.c                     |   19 +
 glib/ghostutils.c                     |   53 +-
 glib/glib.symbols                     |    2 +
 glib/grand.c                          |    4 +-
 glib/grand.h                          |    2 +-
 glib/gsequence.c                      |  138 ++-
 glib/gsequence.h                      |    8 +
 glib/tests/hostutils.c                |   61 +
 glib/tests/rand.c                     |    3 +-
 glib/tests/sequence.c                 |   76 +
 gobject/gboxed.c                      |    4 +-
 gobject/gclosure.c                    |   29 +-
 gobject/gobject.c                     |   12 +-
 gobject/gparam.c                      |    4 +-
 gobject/gvalue.c                      |   13 +-
 gobject/gvaluearray.c                 |   29 +-
 gobject/gvaluetypes.c                 |    2 +-
 gthread/tests/1bit-mutex.c            |    3 -
 po/es.po                              |  355 ++--
 po/et.po                              |  565 +++++---
 po/he.po                              |  240 ++--
 po/nb.po                              |  275 ++--
 po/ug.po                              |  547 ++++---
 po/vi.po                              | 2876 ++++++++++++++++++++++-----------
 69 files changed, 4261 insertions(+), 3204 deletions(-)
---