[gobject-introspection: 2/2] Merge commit 'origin'

[Johan Dahlin <johan src gnome org>]

commit 62b1395a3650f4445dc28ec8f4ff82f0e7cbddd1
Merge: 4fabb3e... 11af623...
Author: Johan Dahlin <johan gnome org>
Date:   Mon Jul 6 11:05:11 2009 -0300

    Merge commit 'origin'

 .topdeps                                   |    1 -
 .topmsg                                    |    2 -
 gir/Everything-1.0-expected.gir            |  133 ++++++++++++++++++++++++++++
 gir/everything.c                           |  123 +++++++++++++++++++++++++
 gir/everything.h                           |   33 +++++++
 gir/gio-2.0.c                              |    3 +
 gir/glib-2.0.c                             |    5 +
 gir/libxml2-2.0.gir                        |    1 +
 girepository/ginfo.c                       |   34 ++++----
 girepository/girnode.c                     |   16 ++--
 girepository/gtypelib.c                    |   24 +++---
 girepository/gtypelib.h                    |    4 +-
 giscanner/annotationparser.py              |   23 ++++--
 tests/scanner/annotation-1.0-expected.gir  |   16 ++++
 tests/scanner/annotation-1.0-expected.tgir |   15 +++
 tests/scanner/annotation.c                 |   10 ++
 tests/scanner/annotation.h                 |    2 +
 tests/scanner/utility-1.0-expected.gir     |    8 ++
 tests/scanner/utility-1.0-expected.tgir    |    8 ++
 tests/scanner/utility.c                    |    6 ++
 tests/scanner/utility.h                    |    7 ++
 21 files changed, 426 insertions(+), 48 deletions(-)
---