[Zope-Checkins] CVS: Zope2 - ZopeSecurityPolicy.py:1.7

[Brian Lloyd]

Update of /cvs-repository/Zope2/lib/python/AccessControl
In directory korak.digicool.com:/home/brian/temp/zope_trunk/lib/python/AccessControl

Modified Files:
	ZopeSecurityPolicy.py 
Log Message:
Merged 'hasRole' -> 'allowed' fixup from branch