[dconf: 2/2] Merge remote branch 'gvdb/master'

[Ryan Lortie <ryanl src gnome org>]

commit e4073ddfe2a03f4c9e0eb9f08fd997a2087b6f75
Merge: 46bed21 df40747
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Jul 18 20:46:24 2010 -0400

    Merge remote branch 'gvdb/master'

 gvdb/gvdb-reader.c |   17 +++++++++++++++++
 gvdb/gvdb-reader.h |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)
---