Merge fix for issue #11149.

author Stefan Krah <skrah@bytereef.org>

Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)

committer Stefan Krah <skrah@bytereef.org>

Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)
author Stefan Krah <skrah@bytereef.org>
Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)
committer Stefan Krah <skrah@bytereef.org>
Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)
committer	Stefan Krah <skrah@bytereef.org>
	Wed, 14 Sep 2011 13:17:12 +0000 (15:17 +0200)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history