Bring SunOS fix on par with what trunk has
Merge branch 'joyent/feature/miscfix/2013Q1' into joyent/release/2013Q1
Update joyent submodule