merged.

--HG--
branch : trunk

diff --cc CHANGES
index b8450fcc1a629075849ffb36a580ec5b0dc26547,1701f6195697ff7d8ff9c26abd8f5910b98f896f..380a7c360d05cd33840a528512e7eadc74243667
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -20,7 -20,9 +20,10 @@@ Version 2.
    *before* the loop.  (#331)
  - Added support for optional `scoped` modifier to blocks.
  - Added support for line-comments.
 +- Added the `meta` module.
+ - Renamed (undocumented) attribute overlay to overlayed on the environment
+   because it was clashing with a method of the same name.  The new attribute
+   is called "overlayed".
  
  Version 2.1.1
  -------------