Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 8 Oct 2010 19:09:01 +0000 (21:09 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 8 Oct 2010 19:09:01 +0000 (21:09 +0200)

Trivial merge