terminator can't coexist with python 2.7
Merge pull request #837 from pyhalov/terminator

terminator can't coexist with python 2.7
We want to use illumos-gate-provided libm. Avoid delivering OpenSolaris-derived libm.
Merge pull request #840 from pyhalov/libm

We want to use illumos-gate-provided libm.
Add CUnit 2.1-3