Don't get lost.
Patch from Alexander Larsson:
http://lists.freedesktop.org/archives/dbus/2006-September/005604.html