Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)

Trivial merge