Fix patch file.
Merge branch 'joyent/feature/multiarch/2013Q3' into joyent/release/2013Q3
Update 'joyent' submodule.