# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1259697474 0
# Node ID a6d69f00a509d45311a6558968cdd8c622f4c15b
# Parent  97f25da177afaeda81963e4ad19f614cb3f55965# Parent  9368ab10c1a88901920821f78d4aca3e3d9af243
Merge with trunk

diff -r 9368ab10c1a8 -r a6d69f00a509 core/modulemanager.lua
--- a/core/modulemanager.lua	Tue Dec 01 22:32:37 2009 +0500
+++ b/core/modulemanager.lua	Tue Dec 01 19:57:54 2009 +0000
@@ -158,6 +158,7 @@
 		log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
 	end
 	if success then
+		hosts[host].events.fire_event("module-loaded", { module = module_name, host = host });
 		return true;
 	else -- load failed, unloading
 		unload(api_instance.host, module_name);
@@ -200,6 +201,7 @@
 	end
 	hooks:remove(host, name);
 	modulemap[host][name] = nil;
+	hosts[host].events.fire_event("module-unloaded", { module = name, host = host });
 	return true;
 end