Merge second fix for issue #11149.

author Stefan Krah <skrah@bytereef.org>

Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)

committer Stefan Krah <skrah@bytereef.org>

Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)
author Stefan Krah <skrah@bytereef.org>
Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)
committer Stefan Krah <skrah@bytereef.org>
Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)
committer	Stefan Krah <skrah@bytereef.org>
	Thu, 8 Dec 2011 21:22:58 +0000 (22:22 +0100)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history