no reason to make our own variable
Merge branch 'master' of src.omniti.com:~omnios/core/omnios-build
Update to perl 5.16.3 and change layout to allow future patch upgrades.
Merge branch 'master' of src.omniti.com:~omnios/core/omnios-build
Revert "Update to perl 5.16.3 and change layout to allow future patch upgrades."

This reverts commit 1ed78222e9394423fa4ea4c4e245fa4b9fe6b4e6.
Instead of upgrading perl, just patch the issue we want to fix.