[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - ZopePageTemplate.py:1.42.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv3114/lib/python/Products/PageTemplates

Modified Files:
      Tag: chrism-install-branch
	ZopePageTemplate.py 
Log Message:
Merge of head into installer-branch.  Sorry.  :-(


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.42.4.1 => 1.42.4.2 ===