[glib: 4/4] Merge remote branch 'gvdb/master'

[Ryan Lortie <ryanl src gnome org>]

commit 45a1c41e8cfdeb4edeb7a671b95e599a49c6c281
Merge: defd75f 3c10369
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Apr 15 22:14:18 2010 -0400

    Merge remote branch 'gvdb/master'

 gio/gvdb/gvdb-builder.c |  540 +++++++++++++++++++++++++++++++++++++++++++++++
 gio/gvdb/gvdb-builder.h |   60 ++++++
 gio/gvdb/gvdb-format.h  |   89 ++++++++
 gio/gvdb/gvdb-reader.c  |  510 ++++++++++++++++++++++++++++++++++++++++++++
 gio/gvdb/gvdb-reader.h  |   54 +++++
 gio/gvdb/gvdb.doap      |   32 +++
 6 files changed, 1285 insertions(+), 0 deletions(-)
---
diff --cc gio/gvdb/gvdb-builder.c
index 0000000,45c5f4b..45c5f4b
mode 000000,100644..100644
--- a/gio/gvdb/gvdb-builder.c
+++ b/gio/gvdb/gvdb-builder.c
diff --cc gio/gvdb/gvdb-builder.h
index 0000000,c0d3b30..c0d3b30
mode 000000,100644..100644
--- a/gio/gvdb/gvdb-builder.h
+++ b/gio/gvdb/gvdb-builder.h
diff --cc gio/gvdb/gvdb-format.h
index 0000000,41c8254..41c8254
mode 000000,100644..100644
--- a/gio/gvdb/gvdb-format.h
+++ b/gio/gvdb/gvdb-format.h
diff --cc gio/gvdb/gvdb-reader.c
index 0000000,65bef5e..65bef5e
mode 000000,100644..100644
--- a/gio/gvdb/gvdb-reader.c
+++ b/gio/gvdb/gvdb-reader.c
diff --cc gio/gvdb/gvdb-reader.h
index 0000000,0e4b79e..0e4b79e
mode 000000,100644..100644
--- a/gio/gvdb/gvdb-reader.h
+++ b/gio/gvdb/gvdb-reader.h
diff --cc gio/gvdb/gvdb.doap
index 0000000,b4ae60c..b4ae60c
mode 000000,100644..100644
--- a/gio/gvdb/gvdb.doap
+++ b/gio/gvdb/gvdb.doap