Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Tue, 27 Apr 2010 09:22:32 +0000 (11:22 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 27 Apr 2010 09:22:32 +0000 (11:22 +0200)

Trivial merge