Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 12 Feb 2010 07:46:10 +0000 (08:46 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 12 Feb 2010 07:46:10 +0000 (08:46 +0100)

Trivial merge