Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 23 Dec 2009 22:16:35 +0000 (23:16 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 23 Dec 2009 22:16:35 +0000 (23:16 +0100)

Trivial merge