[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - Expressions.py:1.36.4.6 GlobalTranslationService.py:1.2.2.5 PageTemplate.py:1.25.4.6 PageTemplateFile.py:1.19.4.6 PythonExpr.py:1.8.4.5 TALES.py:1.31.4.5 ZopePageTemplate.py:1.42.4.8

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Expressions.py GlobalTranslationService.py PageTemplate.py 
	PageTemplateFile.py PythonExpr.py TALES.py ZopePageTemplate.py 
Log Message:
Merge with HEAD.


=== Zope/lib/python/Products/PageTemplates/Expressions.py 1.36.4.5 => 1.36.4.6 ===


=== Zope/lib/python/Products/PageTemplates/GlobalTranslationService.py 1.2.2.4 => 1.2.2.5 ===


=== Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.25.4.5 => 1.25.4.6 ===


=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.19.4.5 => 1.19.4.6 ===


=== Zope/lib/python/Products/PageTemplates/PythonExpr.py 1.8.4.4 => 1.8.4.5 ===


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.31.4.4 => 1.31.4.5 ===


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.42.4.7 => 1.42.4.8 ===