Merge 3.3.

author Stefan Krah <skrah@bytereef.org>

Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)

committer Stefan Krah <skrah@bytereef.org>

Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)
author Stefan Krah <skrah@bytereef.org>
Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)
committer Stefan Krah <skrah@bytereef.org>
Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)
committer	Stefan Krah <skrah@bytereef.org>
	Thu, 17 Jan 2013 19:44:02 +0000 (20:44 +0100)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history