Merge branch 'master' of ssh://walters@git.freedesktop.org/git/dbus/dbus
authorColin Walters <walters@verbum.org>
Thu, 24 Jul 2008 20:19:34 +0000 (16:19 -0400)
committerColin Walters <walters@verbum.org>
Thu, 24 Jul 2008 20:19:34 +0000 (16:19 -0400)

Trivial merge