joyent/smartos-live#233: `logadm` errors
Merge branch 'master' of git://github.com/joyent/smartos-overlay into ec