[dconf: 3/8] Merge remote branch 'gvdb/master'

[Ryan Lortie <ryanl src gnome org>]

commit c81c09ea027e7dbc45ae202137ea2281e7295ed8
Merge: 4e0a2bc afea703
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jun 10 16:37:19 2010 -0400

    Merge remote branch 'gvdb/master'

 gvdb/gvdb-builder.c |   41 -----------------------------------------
 gvdb/gvdb-builder.h |    3 ---
 gvdb/gvdb-format.h  |    2 --
 gvdb/gvdb-reader.c  |   37 +++++++++++++++----------------------
 gvdb/gvdb-reader.h  |    3 +--
 5 files changed, 16 insertions(+), 70 deletions(-)
---