Fix merge botch.
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk