Merge from trunk

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

Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)

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

Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)
author Amos Jeffries <squid3@treenet.co.nz>
Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)
committer Amos Jeffries <squid3@treenet.co.nz>
Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)
diff --cc CREDITS
Simple merge
diff --cc bootstrap.sh
Simple merge
diff --cc configure.in
Simple merge
diff --cc doc/release-notes/release-3.2.sgml
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Sun, 1 Nov 2009 01:20:30 +0000 (14:20 +1300)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
bootstrap.sh	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/release-notes/release-3.2.sgml	patch \|	diff1 \|	diff2 \|	blob \| history