# HG changeset patch
# User cmlenz
# Date 1160990820 0
# Node ID f1569069b6e8e9f9b20069aa611c0f5188cb4330
# Parent  e3ee88d5113fa4ec648b941488f8685742165c46
Ported [374] to 0.3.x branch.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 Version 0.3.3
 http://svn.edgewall.org/repos/genshi/tags/0.3.3/
-(?, from branches/stable/0.3.x)
+(Oct 16 2006, from branches/stable/0.3.x)
 
  * Fixed bug introduced in 0.3.2 that broke the parsing of templates which
    declare the same namespace more than once in a nested fashion.
  * Fixed the parsing of HTML entity references inside attribute values, both
    in the `XMLParser` and the `HTMLParser` classes.
+ * Some changes to usage of absolute vs. relative template paths to ensure that
+   the filenamed-keyed cache employed by the TemplateLoader doesn't mix up
+   templates with the same name, but from different subdirectories.
 
 
 Version 0.3.2