Merge remote branch 'gvdb/master'

diff --cc gio/gvdb/gvdb-builder.c
Simple merge

diff --cc gio/gvdb/gvdb-builder.h
Simple merge

diff --cc gio/gvdb/gvdb-format.h
Simple merge

diff --cc gio/gvdb/gvdb-reader.c
Simple merge

diff --cc gio/gvdb/gvdb-reader.h
Simple merge