Added back some dependencies that are needed for python 2.6 (at least)

Conflicts:

	buildout.cfg