Reverting all the dbus related commits (sigh) from 27th July and fixing a QA issue...
[oespirit1] / sapwood /
drwxr-xr-x   ..
-rw-r--r-- 2454 mer-changes.patch
-rw-r--r-- 2721 socket.patch