Add zenoss 4.2 dependancies
Merge branch 'master' of https://github.com/eedgar/ZenossEnterprise