[Zope-Checkins] CVS: Zope2 - zdaemon.py:1.6

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python
In directory korak.digicool.com:/tmp/cvs-serv3049

Modified Files:
	zdaemon.py 
Log Message:
Merged 1.5.140.1 and 1.5.140.2.