Apply pull request #2 from @wohali to the upstream:
Support SmartOS, lists in attributes