Forked from http://dev.zenoss.org/svn/tags/zenoss-4.2.4/