FilipinOTech/illumos-gate — pull request #9 by nimbosa (2014-06-09 05:54:45+00:00)
Title: merge 2014-06-04 to 2014-06-08 changes from upstream illumos-gate master

merge 2014-06-04 to 2014-06-08 changes from upstream illumos-gate master