Merge remote branch 'gvdb/master'
authorRyan Lortie <desrt@desrt.ca>
Thu, 27 Jan 2011 16:45:04 +0000 (11:45 -0500)
committerRyan Lortie <desrt@desrt.ca>
Thu, 27 Jan 2011 16:45:04 +0000 (11:45 -0500)
commitd8ca6404229e5b64d2bf2e1a3660ad9fe7feefdd
tree386eac6f8d5bdcd756de49bb8682e1750b8e8d03
parent73410f1176c276e244c172fd36037ada8db12a3d
parent03b6b9fb9775387c3ec5eedb9e5d2152d6468147
Merge remote branch 'gvdb/master'
gio/gvdb/gvdb-builder.c
gio/gvdb/gvdb-reader.c
gio/gvdb/gvdb-reader.h