Merge issue #15819: tweak logic in previous commit.

author Trent Nelson <trent@trent.me>

Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)

committer Trent Nelson <trent@trent.me>

Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)
author Trent Nelson <trent@trent.me>
Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)
committer Trent Nelson <trent@trent.me>
Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Trent Nelson <trent@trent.me>
	Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)
committer	Trent Nelson <trent@trent.me>
	Tue, 16 Oct 2012 15:09:31 +0000 (11:09 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history