Merge branch 'master' into inline_caching

author Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)

committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)
author Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)
committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)
diff --cc Makefile
Simple merge
diff --cc vm/code_block.c
Simple merge
author	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)
committer	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Mon, 27 Apr 2009 02:26:39 +0000 (21:26 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
vm/code_block.c	patch \|	diff1 \|	diff2 \|	blob \| history