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

[Ryan Lortie <ryanl src gnome org>]

commit a8fe07c1238d6b2345672f54a1ce875191b5bef7
Merge: facae6f fc37611
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Jul 9 15:29:23 2012 -0400

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

 gvdb/gvdb-reader.c |  127 ----------------------------------------------------
 gvdb/gvdb-reader.h |   19 --------
 2 files changed, 0 insertions(+), 146 deletions(-)
---