# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1240967335 -3600
# Node ID 0cb325970a50fd88113bbdf0a89589ceed80024a
# Parent  63b7a81d45eb9ad4d3b3ba36c188288f14ee525c# Parent  3806173670f2ddecdcc1effbe0e3b83699e14c02
Merge with 0.4

diff -r 63b7a81d45eb -r 0cb325970a50 configure
--- a/configure	Thu Apr 23 21:06:51 2009 +0100
+++ b/configure	Wed Apr 29 02:08:55 2009 +0100
@@ -78,6 +78,10 @@
       PREFIX="$value"
       PREFIX_SET=yes
       ;;
+   --sysconfdir=*)
+      SYSCONFDIR="$value"
+      SYSCONFDIR_SET=yes
+      ;;
    --ostype=*)
       OSTYPE="$value"
       OSTYPE_SET=yes
diff -r 63b7a81d45eb -r 0cb325970a50 core/componentmanager.lua
--- a/core/componentmanager.lua	Thu Apr 23 21:06:51 2009 +0100
+++ b/core/componentmanager.lua	Wed Apr 29 02:08:55 2009 +0100
@@ -103,7 +103,7 @@
 function deregister_component(host)
 	if components[host] then
 		modulemanager.unload(host, "dialback");
-		host.connected = nil;
+		hosts[host].connected = nil;
 		local host_config = configmanager.getconfig()[host];
 		if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
 			-- Set default handler
diff -r 63b7a81d45eb -r 0cb325970a50 plugins/mod_muc.lua
diff -r 63b7a81d45eb -r 0cb325970a50 plugins/mod_posix.lua