[Zope-dev] Branches finished for merging.

[Lennart Regebro]

Do we want to include optional twisted in 2.10 too? It works now, for http. :-)
Haven't tried the ftp yet, but if I finish it until tomorrow?