[glib/gvariant: 2/2] Merge branch 'master' into gvariant

[Ryan Lortie <ryanl src gnome org>]

commit bce67fafa5ceb6c21db8fd8d119f3b378b081bb4
Merge: bb2af31... 74a970f...
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Nov 30 19:57:11 2009 -0500

    Merge branch 'master' into gvariant

 configure.in                             |    5 ++
 docs/reference/glib/glib-sections.txt    |   12 +++++
 docs/reference/glib/tmpl/byte_order.sgml |   72 ++++++++++++++++++++++++++++++
 glib/gtypes.h                            |    5 ++
 glibconfig.h.win32.in                    |    4 ++
 5 files changed, 98 insertions(+), 0 deletions(-)
---