[glib: 2/2] Merge remote-tracking branch 'gvdb/master'

[Ryan Lortie <ryanl src gnome org>]

commit 1b033919845cef366842373da9f1cfb56f522d01
Merge: 2d44a45 92652ac
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Sep 12 08:12:57 2011 -0400

    Merge remote-tracking branch 'gvdb/master'

 gio/gvdb/gvdb-builder.c |    2 +-
 gio/gvdb/gvdb-reader.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---