Merge branch 'master' of ssh://rhabacker@git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Tue, 13 Apr 2010 17:45:22 +0000 (19:45 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 13 Apr 2010 17:45:22 +0000 (19:45 +0200)

Trivial merge