Merge 0.8->trunk.

2 files changed, 3 insertions, 2 deletions

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 211b49b6..e8f76aeb 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -68,12 +68,11 @@ function load_modules_for_host(host)
 	if host_modules_enabled == global_modules_enabled then host_modules_enabled = nil; end
 	if host_modules_disabled == global_modules_disabled then host_modules_disabled = nil; end
 	
-	local host_modules = set.new(host_modules_enabled) - set.new(host_modules_disabled);
 	local global_modules = set.new(autoload_modules) + set.new(global_modules_enabled) - set.new(global_modules_disabled);
 	if component then
 		global_modules = set.intersection(set.new(component_inheritable_modules), global_modules);
 	end
-	local modules = global_modules + host_modules;
+	local modules = (global_modules + set.new(host_modules_enabled)) - set.new(host_modules_disabled);
 	
 	-- COMPAT w/ pre 0.8
 	if modules:contains("console") then
diff --git a/util/stanza.lua b/util/stanza.lua
index 79c1a71e..7d1f5693 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -44,11 +44,13 @@ module "stanza"
 
 stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
+local stanza_mt = stanza_mt;
 
 function stanza(name, attr)
 	local stanza = { name = name, attr = attr or {}, tags = {} };
 	return setmetatable(stanza, stanza_mt);
 end
+local stanza = stanza;
 
 function stanza_mt:query(xmlns)
 	return self:tag("query", { xmlns = xmlns });