Merge branch 'master' of ssh://walters@git.gnome.org/git/gobject-introspection
authorColin Walters <walters@verbum.org>
Tue, 17 Feb 2009 21:59:48 +0000 (16:59 -0500)
committerColin Walters <walters@verbum.org>
Tue, 17 Feb 2009 21:59:48 +0000 (16:59 -0500)

Trivial merge