Merge in Joyent's sd.conf changes