Code

merge Zope Collector #580 fix from ZPT CVS trunk