Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4
Merge branch 'joyent/feature/openssl1/2012Q4' into joyent/release/2012Q4
Merge branch 'joyent/feature/smf/2012Q4' into joyent/release/2012Q4
Add 'joyent' and 'wip' submodules
Allow sources for SMF manifest/method to be overriden (e.g. from $WRKSRC)
Fix copy/paste mistake
Merge branch 'joyent/feature/smf/2012Q4' into joyent/release/2012Q4
No reason not to build against pkgsrc openssl
Ensure that pkgsrc openssl tool is used if not using builtin openssl.
Merge branch 'joyent/feature/miscfix/2012Q4' into joyent/release/2012Q4