Merge with 0.4

author Matthew Wild <mwild1@gmail.com>

Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)

committer Matthew Wild <mwild1@gmail.com>

Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)
author Matthew Wild <mwild1@gmail.com>
Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)
committer Matthew Wild <mwild1@gmail.com>
Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)
diff --cc core/componentmanager.lua
Simple merge
diff --cc net/server.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Sun, 3 May 2009 00:11:21 +0000 (01:11 +0100)
		1	2
core/componentmanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history
net/server.lua	patch \|	diff1 \|	diff2 \|	blob \| history