From e9c33a4c0351121b1230051b3ec6950a7001c017 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 25 Jun 2012 23:58:54 -0400
Subject: [PATCH] Closes issue #885. Closes issue #886.

---
 common/modules/io.jsm         | 1 +
 common/modules/javascript.jsm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/modules/io.jsm b/common/modules/io.jsm
index 8fe4a2c3..c7895b32 100644
--- a/common/modules/io.jsm
+++ b/common/modules/io.jsm
@@ -18,6 +18,7 @@ lazyRequire("config", ["config"]);
 lazyRequire("contexts", ["Contexts", "contexts"]);
 lazyRequire("storage", ["File", "storage"]);
 lazyRequire("styles", ["styles"]);
+lazyRequire("template", ["template"]);
 
 // TODO: why are we passing around strings rather than file objects?
 /**
diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm
index 1e16b5ef..85e27052 100644
--- a/common/modules/javascript.jsm
+++ b/common/modules/javascript.jsm
@@ -9,7 +9,8 @@ let { getOwnPropertyNames } = Object;
 try {
 
 defineModule("javascript", {
-    exports: ["JavaScript", "javascript"]
+    exports: ["JavaScript", "javascript"],
+    require: ["util"]
 });
 
 lazyRequire("template", ["template"]);