Dirty patch against trunk to update ruby-daemon_controller to 1.2.0.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4
Update joyent