Merged from trunk

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

Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)

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

Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)
author Amos Jeffries <squid3@treenet.co.nz>
Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)
committer Amos Jeffries <squid3@treenet.co.nz>
Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)
diff --cc configure.in
Simple merge
diff --cc src/helper.cc
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Mon, 24 Aug 2009 09:45:21 +0000 (21:45 +1200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/helper.cc	patch \|	diff1 \|	diff2 \|	blob \| history