(Also removed some extra imports and made formatting changes.)


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@103232 62d5b8a3-27da-0310-9561-8e5933582275