Merge from TRUNK

author Amos Jeffries <squid3@treenet.co.nz>

Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)

committer Amos Jeffries <squid3@treenet.co.nz>

Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)
author Amos Jeffries <squid3@treenet.co.nz>
Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)
committer Amos Jeffries <squid3@treenet.co.nz>
Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)
diff --cc configure.in
Simple merge
diff --cc src/comm.cc
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Sat, 5 Apr 2008 22:57:27 +0000 (10:57 +1200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/comm.cc	patch \|	diff1 \|	diff2 \|	blob \| history