[dconf/wip/reorg: 469/498] Merge remote-tracking branch 'gvdb/master' into wip/reorg

[Ryan Lortie <ryanl src gnome org>]

commit e47d1137ed79f10178ef901a8a2f1232266a2745
Merge: cc3221d a9551cc
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jul 5 23:15:20 2012 -0400

    Merge remote-tracking branch 'gvdb/master' into wip/reorg

 gvdb/gvdb-builder.c |    7 ++
 gvdb/gvdb-reader.c  |  152 +++++++++++++++++++++++++++++++++++++--------------
 gvdb/gvdb-reader.h  |   10 +++
 3 files changed, 128 insertions(+), 41 deletions(-)
---