Revert "Attempt to backport 83abc3a97f to erp5-vifib branch."

It seems this hack is no longer needed for the moment.

This reverts commit e5852bed.

stack/erp5.cfg

@@ -11,8 +11,6 @@ find-links =
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
     http://www.owlfish.com/software/wsgiutils/download.html
-# Provide dummy distribute 0.7 for setuptools 0.7 compatiblity
-    https://bitbucket.org/pypa/setuptools/downloads
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -290,8 +288,6 @@ eggs =
   ${python-ldap-python:egg}
   ${pysvn-python:egg}
   ${pycrypto-python:egg}
-# Force install distribute 0.7 before bad eggs try to install it by themselves
-  distribute
   PyXML
   SOAPpy
   cElementTree
@@ -446,11 +442,6 @@ Products.CMFUid = 2.2.1
 # Unpined locally developed egg
 slapos.cookbook =
 
-# setuptools 0.7 (merge of setuptools 0.6 and distribute 0.6) breaks buildout if
-# installed with distribute 0.6.x. Force install dummy distribute.
-distribute = 0.7
-setuptools = 0.7.2
-
 # Pinned versions
 Flask = 0.8
 GitPython = 0.3.2.RC1
@@ -518,6 +509,7 @@ python-magic = 0.4.2
 python-memcached = 1.47
 restkit = 4.1.2
 rtjp-eventlet = 0.3.2
+setuptools = 0.6c12dev-r88846
 slapos.core = 
 slapos.recipe.build = 0.7
 slapos.recipe.template = 2.4