* merge all the latest DBus-updates from Derek Upham