Merge remote branch 'gvdb/master'
authorRyan Lortie <desrt@desrt.ca>
Mon, 4 Oct 2010 01:11:17 +0000 (21:11 -0400)
committerRyan Lortie <desrt@desrt.ca>
Mon, 4 Oct 2010 01:11:17 +0000 (21:11 -0400)
1  2 
gio/gvdb/gvdb-reader.c
gio/gvdb/gvdb-reader.h

Simple merge
Simple merge