[Zope3-checkins] CVS: ZODB3/ZConfig - __init__.py:1.11

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZConfig
In directory cvs.zope.org:/tmp/cvs-serv18770/ZConfig

Modified Files:
	__init__.py 
Log Message:
Merge changes from Zope-2_7-branch to the trunk.


=== ZODB3/ZConfig/__init__.py 1.10 => 1.11 ===