the environment template loading functions now transparently
pass through a template object if it was passed to it.  This
makes it possible to import or extend from a template object
that was passed to the template.

--HG--
branch : trunk
diff --git a/CHANGES b/CHANGES
index 8d1b8b6..26b386e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 -----------
 (codename to be selected, release date to be decided)
 
+- the environment template loading functions now transparently
+  pass through a template object if it was passed to it.  This
+  makes it possible to import or extend from a template object
+  that was passed to the template.
+
 Version 2.3
 -----------
 (3000 Pythons, released on February 10th 2010)