Merge pull request #7572 from dezgeg/pr-trinity
trinity: New package
Edward Tjörnhammar 11 years ago a682c2eb 2f15fcc4