[glib: 13/13] Merge branch 'gwakeup'

[Ryan Lortie <ryanl src gnome org>]

commit 12f516b44cb3b91d99a9ea0f0c51aaeeb3562688
Merge: 32b1349 39b72a1
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Jul 26 10:50:25 2011 +0200

    Merge branch 'gwakeup'

 configure.ac                        |    1 +
 docs/reference/glib/Makefile.am     |    3 +
 docs/reference/glib/tmpl/.gitignore |    1 +
 gio/Makefile.am                     |    1 +
 gio/gcancellable.c                  |  236 ++++-------------------------
 glib/Makefile.am                    |    2 +
 glib/gmain.c                        |  113 ++-------------
 glib/gwakeup.c                      |  260 +++++++++++++++++++++++++++++++++
 glib/gwakeup.h                      |   35 +++++
 gthread/tests/.gitignore            |    2 +
 gthread/tests/Makefile.am           |   11 ++
 gthread/tests/gwakeuptest.c         |  276 +++++++++++++++++++++++++++++++++++
 12 files changed, 638 insertions(+), 303 deletions(-)
---