Fix merge botch.
Merge branch 'joyent/feature/multiarch/2013Q1' into joyent/release/2013Q1_multiarch