Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 9 Oct 2007 13:06:54 +0000 (14:06 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 9 Oct 2007 13:06:54 +0000 (14:06 +0100)

Trivial merge