RFD9: Updated with Trent feedback
RFD9: Updated with Trent feedback

melloc/rfd,davepacheco/rfd,davepacheco/rfd,AnthonyMann/rfd,rmustacc/rfd,AnthonyMann/rfd,joyent/rfd,davepacheco/rfd,joyent/rfd,melloc/rfd,davepacheco/rfd,melloc/rfd,davepacheco/rfd,rmustacc/rfd,joyent/rfd,joyent/rfd