Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 10 Oct 2007 16:39:41 +0000 (17:39 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 10 Oct 2007 16:39:41 +0000 (17:39 +0100)

Trivial merge