Merge with tip.

author Tobias Markmann <tm@ayena.de>

Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)

committer Tobias Markmann <tm@ayena.de>

Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
author Tobias Markmann <tm@ayena.de>
Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
committer Tobias Markmann <tm@ayena.de>
Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
diff --cc net/server_select.lua
Simple merge
diff --cc util/sasl.lua
Simple merge
author	Tobias Markmann <tm@ayena.de>
	Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
committer	Tobias Markmann <tm@ayena.de>
	Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
		1	2
net/server_select.lua	patch \|	diff1 \|	diff2 \|	blob \| history
util/sasl.lua	patch \|	diff1 \|	diff2 \|	blob \| history