[Checkins] SVN: grok/trunk/ the layout directive was not imported into the grok namespace

[Jan Wijbrand Kolman]

Log message for revision 125806:
  the layout directive was not imported into the grok namespace

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/src/grok/__init__.py

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2012-05-09 23:47:12 UTC (rev 125805)
+++ grok/trunk/CHANGES.txt	2012-05-10 10:07:33 UTC (rev 125806)
@@ -4,9 +4,8 @@
 1.11 (unreleased)
 =================
 
-- Nothing changed yet.
+- Import the grokcore.layout.layout directive into the grok namespace too.
 
-
 1.10.1 (2012-05-02)
 ===================
 

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2012-05-09 23:47:12 UTC (rev 125805)
+++ grok/trunk/src/grok/__init__.py	2012-05-10 10:07:33 UTC (rev 125806)
@@ -65,6 +65,7 @@
 from grokcore.layout import UnauthorizedPage
 from grokcore.layout import NotFoundPage
 from grokcore.layout import ExceptionPage
+from grokcore.layout import layout
 
 from grokcore.annotation import Annotation