[Zope3-checkins] CVS: Zope3/src/zope/component - __init__.py:1.5 servicenames.py:1.4

[Sidnei da Silva]

Update of /cvs-repository/Zope3/src/zope/component
In directory cvs.zope.org:/tmp/cvs-serv3664/src/zope/component

Modified Files:
	__init__.py servicenames.py 
Log Message:
Merging paris-copypasterename-branch. Not very fun :(

=== Zope3/src/zope/component/__init__.py 1.4 => 1.5 ===


=== Zope3/src/zope/component/servicenames.py 1.3 => 1.4 ===