Merge commit '0ce224594ae5a673f6a397c284db5f5a61935334'

author Andy Wingo <wingo@pobox.com>

Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)

committer Andy Wingo <wingo@pobox.com>

Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)
author Andy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)
committer Andy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)
diff --cc test-suite/tests/bytevectors.test
Simple merge
diff --cc test-suite/tests/regexp.test
Simple merge
diff --cc test-suite/tests/tree-il.test
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)
committer	Andy Wingo <wingo@pobox.com>
	Sat, 8 Feb 2014 13:48:56 +0000 (14:48 +0100)
		1	2
test-suite/tests/bytevectors.test	patch \|	diff1 \|	diff2 \|	blob \| history
test-suite/tests/regexp.test	patch \|	diff1 \|	diff2 \|	blob \| history
test-suite/tests/tree-il.test	patch \|	diff1 \|	diff2 \|	blob \| history